Fixed some path errors with Jenkins build scripts, and added preparation scripts.

devtools/packaging/scripts/linux/build.sh

@@ -4,7 +4,7 @@
 # Note that this must be run from outside the checked-out openmm/ directory.
 
 # Add conda binaries to path.
-PATH=${HOME}/miniconda/bin:${PATH}
+PATH=$WORKSPACE/miniconda/bin:$PATH
 
 INSTALL=`pwd`/install
 CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$INSTALL"
@@ -21,7 +21,7 @@ CMAKE_FLAGS+=" -DOPENCL_INCLUDE_DIR=/usr/local/cuda-6.5/include"
 CMAKE_FLAGS+=" -DOPENCL_LIBRARY=/usr/local/cuda-6.5/lib64/libOpenCL.so"
 
 # Set location for FFTW3
-PREFIX="${HOME}/miniconda"
+PREFIX="$WORKSPACE/miniconda"
 CMAKE_FLAGS+=" -DFFTW_INCLUDES=$PREFIX/include"
 CMAKE_FLAGS+=" -DFFTW_LIBRARY=$PREFIX/lib/libfftw3f.so"
 CMAKE_FLAGS+=" -DFFTW_THREADS_LIBRARY=$PREFIX/lib/libfftw3f_threads.so"
@@ -41,7 +41,7 @@ OPENMM_INCLUDE_PATH=$INSTALL/include
 OPENMM_LIB_PATH=$INSTALL/lib
 cd python
 python setup.py install --prefix=$INSTALL
-cd ..
+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

devtools/packaging/scripts/linux/prepare.sh

+#!/bin/tcsh
+
+# Prepare for build by ensuring necessary prerequisites are locally installed.
+
+# Install miniconda
+export VERSION="3.7.0"
+export PLATFORM="Linux"
+export ARCH="x86_64"
+export MINICONDA="Miniconda-$VERSION-$PLATFORM-$ARCH.sh"
+if [ -f $MINICONDA ];
+then
+   echo "File $MINICONDA exists, not downloading."
+   export PATH=$WORKSPACE/miniconda/bin:$PATH
+else
+   echo "Downloading miniconda..."
+   wget http://repo.continuum.io/miniconda/${MINICONDA}
+   bash ${MINICONDA} -b -p miniconda
+   PIP_ARGS="-U"
+   export PATH=$WORKSPACE/miniconda/bin:$PATH
+   conda config --add channels http://conda.binstar.org/omnia
+   conda install --yes --quiet swig fftw3f pip
+   pip install sphinxcontrib-bibtex
+fi

devtools/packaging/scripts/osx/build.sh

@@ -4,7 +4,7 @@
 # Note that this must be run from outside the checked-out openmm/ directory.
 
 # Add conda binaries to path.
-PATH=${HOME}/miniconda/bin:${PATH}
+PATH=$WORKSPACE/miniconda/bin:$PATH
 
 INSTALL=`pwd`/install
 CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$INSTALL"
@@ -22,7 +22,7 @@ CMAKE_FLAGS+=" -DOPENMM_BUILD_OPENCL_DOUBLE_PRECISION_TESTS=FALSE"
 
 # Build in subdirectory.
 # Set location for FFTW3
-PREFIX="${HOME}/miniconda"
+PREFIX="$WORKSPACE/miniconda"
 CMAKE_FLAGS+=" -DFFTW_INCLUDES=$PREFIX/include"
 CMAKE_FLAGS+=" -DFFTW_LIBRARY=$PREFIX/lib/libfftw3f.so"
 CMAKE_FLAGS+=" -DFFTW_THREADS_LIBRARY=$PREFIX/lib/libfftw3f_threads.so"
@@ -40,10 +40,9 @@ make install
 # Install Python wrappers.
 export OPENMM_INCLUDE_PATH=$INSTALL/include
 export OPENMM_LIB_PATH=$INSTALL/lib
-export PYTHON=$HOME/miniconda/bin/python
 cd python
 $PYTHON setup.py install --prefix=$INSTALL
-cd ..
+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

devtools/packaging/scripts/osx/prepare.sh

+#!/bin/tcsh
+
+# Prepare for build by ensuring necessary prerequisites are locally installed.
+
+# Install miniconda
+export VERSION="3.7.0"
+export PLATFORM="MacOSX"
+export ARCH="x86_64"
+export MINICONDA="Miniconda-$VERSION-$PLATFORM-$ARCH.sh"
+if [ -f $MINICONDA ];
+then
+   echo "File $MINICONDA exists, not downloading."
+   export PATH=$WORKSPACE/miniconda/bin:$PATH
+else
+   echo "Downloading miniconda..."
+   wget http://repo.continuum.io/miniconda/${MINICONDA}
+   bash ${MINICONDA} -b -p miniconda
+   PIP_ARGS="-U"
+   export PATH=$WORKSPACE/miniconda/bin:$PATH
+   conda config --add channels http://conda.binstar.org/omnia
+   conda install --yes --quiet swig fftw3f pip
+   pip install sphinxcontrib-bibtex
+fi