Merge pull request #746 from jchodera/fix-packaging-scripts

Modified packaging scripts so that we no longer install Python into lib

devtools/packaging/scripts/linux/build.sh

@@ -10,6 +10,10 @@ export WORKSPACE=`pwd`
 PATH=$WORKSPACE/miniconda/bin:$PATH
 
 INSTALL=`pwd`/install
+if [ -e $INSTALL ]; then
+    rm -rf $INSTALL
+fi
+
 CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$INSTALL"
 
 # setting the rpath so that libOpenMMPME.so finds the right libfftw3
@@ -37,14 +41,6 @@ mkdir build
 cd build
 cmake ../openmm $CMAKE_FLAGS
 make -j4 all DoxygenApiDocs sphinxpdf
-make install
 
-# Install Python wrappers.
-export OPENMM_INCLUDE_PATH=$INSTALL/include
-export OPENMM_LIB_PATH=$INSTALL/lib
-cd python
-python setup.py install --prefix=$INSTALL
-cd ../..
-
-# Copy all tests to bin directory so they will be distributed with install package.
-#cp `find . -name "Test*" -type f -maxdepth 1` $PREFIX/bin
+# Install.
+make install

devtools/packaging/scripts/linux/package.sh

@@ -31,12 +31,13 @@ echo $CMD
 
 # Make Python source distribution.
 echo "Building Python source distribution..."
+pushd .
 cd build
 make PythonSdist
 cd python/dist
 tar zxf OpenMM-${VERSION}.tar.gz
 mv OpenMM-${VERSION} python
-cd ../../..
+popd
 cp -r build/python/dist/python $PACKAGE_DIR/$PACKAGE_SUBDIR
 
 # Create archives.

devtools/packaging/scripts/linux/prepare.sh

@@ -15,6 +15,7 @@ then
    echo "miniconda already exists"
 else
    echo "Downloading miniconda..."
+   rm -rf Miniconda-*
    wget --quiet http://repo.continuum.io/miniconda/${MINICONDA}
    bash ${MINICONDA} -b -p miniconda
    PIP_ARGS="-U"

devtools/packaging/scripts/osx/build.sh

@@ -9,7 +9,12 @@ export WORKSPACE=`pwd`
 # Add conda binaries to path.
 PATH=$WORKSPACE/miniconda/bin:$PATH
 
+# Set install directory.
 INSTALL=`pwd`/install
+if [ -e $INSTALL ]; then
+    rm -rf $INSTALL
+fi
+
 CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$INSTALL"
 
 # setting the rpath so that libOpenMMPME.so finds the right libfftw3
@@ -38,14 +43,6 @@ mkdir build
 cd build
 cmake ../openmm $CMAKE_FLAGS
 make -j4 all DoxygenApiDocs sphinxpdf
-make install
 
-# Install Python wrappers.
-export OPENMM_INCLUDE_PATH=$INSTALL/include
-export OPENMM_LIB_PATH=$INSTALL/lib
-cd python
-$PYTHON setup.py install --prefix=$INSTALL
-cd ../..
-
-# Copy all tests to bin directory so they will be distributed with install package.
-#cp `find . -name "Test*" -type f -maxdepth 1` $PREFIX/bin
+# Install.
+make install

devtools/packaging/scripts/osx/package.sh

@@ -28,12 +28,13 @@ echo $CMD
 
 # Make Python source distribution.
 echo "Building Python source distribution..."
+pushd .
 cd build
 make PythonSdist
 cd python/dist
 tar zxf OpenMM-${VERSION}.tar.gz
 mv OpenMM-${VERSION} python
-cd ../../..
+popd
 cp -r build/python/dist/python $PACKAGE_DIR/$PACKAGE_SUBDIR
 
 # Create archives.

devtools/packaging/scripts/osx/prepare.sh

@@ -15,6 +15,7 @@ then
    echo "miniconda already exists"
 else
    echo "Downloading miniconda..."
+   rm -rf Miniconda-*
    wget --quiet http://repo.continuum.io/miniconda/${MINICONDA}
    bash ${MINICONDA} -b -p miniconda
    PIP_ARGS="-U"