Merge pull request #1369 from peastman/scripts

Updates to packaging scripts for 7.0

devtools/packaging/scripts/linux/build.sh

@@ -19,13 +19,14 @@ CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$INSTALL"
 # setting the rpath so that libOpenMMPME.so finds the right libfftw3
 #CMAKE_FLAGS+=" -DCMAKE_INSTALL_RPATH=.."
 CMAKE_FLAGS+=" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++"
-CMAKE_FLAGS+=" -DCUDA_CUDART_LIBRARY=/usr/local/cuda-7.0/lib64/libcudart.so"
-CMAKE_FLAGS+=" -DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-7.0/bin/nvcc"
-CMAKE_FLAGS+=" -DCUDA_SDK_ROOT_DIR=/usr/local/cuda-7.0/"
-CMAKE_FLAGS+=" -DCUDA_TOOLKIT_INCLUDE=/usr/local/cuda-7.0/include"
-CMAKE_FLAGS+=" -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-7.0/"
-CMAKE_FLAGS+=" -DOPENCL_INCLUDE_DIR=/opt/AMDAPPSDK-2.9-1/include/"
-CMAKE_FLAGS+=" -DOPENCL_LIBRARY=/opt/AMDAPPSDK-2.9-1/lib/x86_64/libOpenCL.so"
+CMAKE_FLAGS+=" -DCUDA_CUDART_LIBRARY=/usr/local/cuda-7.5/lib64/libcudart.so"
+CMAKE_FLAGS+=" -DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-7.5/bin/nvcc"
+CMAKE_FLAGS+=" -DCUDA_SDK_ROOT_DIR=/usr/local/cuda-7.5/"
+CMAKE_FLAGS+=" -DCUDA_TOOLKIT_INCLUDE=/usr/local/cuda-7.5/include"
+CMAKE_FLAGS+=" -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-7.5/"
+CMAKE_FLAGS+=" -DOPENCL_INCLUDE_DIR=/opt/AMDAPPSDK-3.0/include/"
+CMAKE_FLAGS+=" -DOPENCL_LIBRARY=/opt/AMDAPPSDK-3.0/lib/x86_64/libOpenCL.so"
+CMAKE_FLAGS+=" -DOPENMM_GENERATE_API_DOCS=ON"
 
 # Set location for FFTW3
 PREFIX="$WORKSPACE/miniconda"
@@ -40,7 +41,8 @@ fi
 mkdir build
 cd build
 cmake ../openmm $CMAKE_FLAGS
-make -j4 all DoxygenApiDocs sphinxpdf
+make -j4 all install
+make -j4 PythonInstall C++ApiDocs PythonApiDocs sphinxpdf
 
 # Install.
 make install

devtools/packaging/scripts/linux/prepare.sh

@@ -6,10 +6,10 @@
 export WORKSPACE=`pwd`
 
 # Install miniconda
-export VERSION="Latest"
+export VERSION="latest"
 export PLATFORM="Linux"
 export ARCH="x86_64"
-export MINICONDA="Miniconda-$VERSION-$PLATFORM-$ARCH.sh"
+export MINICONDA="Miniconda2-$VERSION-$PLATFORM-$ARCH.sh"
 if [ -f miniconda ];
 then
    echo "miniconda already exists"
@@ -27,4 +27,4 @@ export PATH=$WORKSPACE/miniconda/bin:$PATH
 # Ensure configuration is up to date.
 conda config --add channels http://conda.binstar.org/omnia
 conda install --yes --quiet swig fftw3f pip
-pip install sphinxcontrib-bibtex
+pip install sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen

devtools/packaging/scripts/osx/build.sh

@@ -22,6 +22,7 @@ CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$INSTALL"
 CMAKE_FLAGS+=" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++"
 CMAKE_FLAGS+=" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9"
 CMAKE_FLAGS+=" -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
+CMAKE_FLAGS+=" -DOPENMM_GENERATE_API_DOCS=ON"
 
 # Build in subdirectory.
 # Set location for FFTW3
@@ -37,7 +38,8 @@ fi
 mkdir build
 cd build
 cmake ../openmm $CMAKE_FLAGS
-make -j4 all DoxygenApiDocs sphinxpdf
+make -j4 all install
+make -j4 PythonInstall C++ApiDocs PythonApiDocs sphinxpdf
 
 # Install.
 make install

devtools/packaging/scripts/osx/prepare.sh

@@ -27,4 +27,4 @@ export PATH=$WORKSPACE/miniconda/bin:$PATH
 # Ensure configuration is up to date.
 conda config --add channels http://conda.binstar.org/omnia
 conda install --yes --quiet swig fftw3f pip
-pip install sphinxcontrib-bibtex
+pip install sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen

devtools/packaging/scripts/source/build.sh

@@ -28,6 +28,7 @@ CMAKE_FLAGS+=" -DOPENMM_BUILD_DRUDE_OPENCL_LIB=OFF"
 CMAKE_FLAGS+=" -DOPENMM_BUILD_OPENCL_LIB=OFF"
 CMAKE_FLAGS+=" -DOPENMM_BUILD_RPMD_CUDA_LIB=OFF"
 CMAKE_FLAGS+=" -DOPENMM_BUILD_RPMD_OPENCL_LIB=OFF"
+CMAKE_FLAGS+=" -DOPENMM_GENERATE_API_DOCS=ON"
 
 # Set location for FFTW3
 #PREFIX="$WORKSPACE/miniconda"
@@ -42,7 +43,8 @@ fi
 mkdir build
 cd build
 cmake ../openmm $CMAKE_FLAGS
-make -j4 all DoxygenApiDocs sphinxpdf
+make -j4 all install
+make -j4 PythonInstall C++ApiDocs PythonApiDocs sphinxpdf
 
 # Install.
 make install

devtools/packaging/scripts/source/prepare.sh

@@ -27,4 +27,4 @@ export PATH=$WORKSPACE/miniconda/bin:$PATH
 # Ensure configuration is up to date.
 conda config --add channels http://conda.binstar.org/omnia
 conda install --yes --quiet swig fftw3f pip
-pip install sphinxcontrib-bibtex
+pip install sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen