Commit 6a44c5ca authored by eric pellegrini's avatar eric pellegrini Committed by Remi Perenon
Browse files

refactored the windows build scripts with ILL version of ScientificPython and MMTK

parent 166d6e9f
...@@ -132,7 +132,7 @@ extract wxPython-common-2.8.12.1.${BUILD_TARGET}-py2.7.exe PURELIB ...@@ -132,7 +132,7 @@ extract wxPython-common-2.8.12.1.${BUILD_TARGET}-py2.7.exe PURELIB
extract wxPython-2.8.12.1.${BUILD_TARGET}-py2.7.exe PLATLIB extract wxPython-2.8.12.1.${BUILD_TARGET}-py2.7.exe PLATLIB
# extract netcdf # extract netcdf
extract netCDF4.6.0.${BUILD_TARGET}.exe \$_OUTDIR extract netCDF4.6.0.${BUILD_TARGET}.exe PURELIB
# move the packages to the target directory # move the packages to the target directory
echo "Moving dependencies to ${BUILD_TARGET}" echo "Moving dependencies to ${BUILD_TARGET}"
...@@ -183,6 +183,7 @@ git clone https://code.ill.fr/scientific-software/scientific-python.git ...@@ -183,6 +183,7 @@ git clone https://code.ill.fr/scientific-software/scientific-python.git
cd scientific-python cd scientific-python
git checkout master git checkout master
cmd /V:ON /E:ON /C "${SCRIPT_DIR_WIN}/setup_and_build.bat" "${DEPENDENCIES_DIR_WIN}/scientific-python" "${TARGET_DIR}" "${MSVC_BUILD_TARGET}" "--netcdf_prefix=${DEPENDENCIES_DIR_WIN} --netcdf_dll=${DEPENDENCIES_DIR_WIN}" cmd /V:ON /E:ON /C "${SCRIPT_DIR_WIN}/setup_and_build.bat" "${DEPENDENCIES_DIR_WIN}/scientific-python" "${TARGET_DIR}" "${MSVC_BUILD_TARGET}" "--netcdf_prefix=${DEPENDENCIES_DIR_WIN} --netcdf_dll=${DEPENDENCIES_DIR_WIN}"
cd .. cd ..
rm -rf scientific-python rm -rf scientific-python
...@@ -194,6 +195,7 @@ git clone https://code.ill.fr/scientific-software/mmtk.git ...@@ -194,6 +195,7 @@ git clone https://code.ill.fr/scientific-software/mmtk.git
cd mmtk cd mmtk
git checkout master git checkout master
cmd /V:ON /E:ON /C "${SCRIPT_DIR_WIN}/setup_and_build.bat" "${DEPENDENCIES_DIR_WIN}/mmtk" "${TARGET_DIR}" "${MSVC_BUILD_TARGET}" cmd /V:ON /E:ON /C "${SCRIPT_DIR_WIN}/setup_and_build.bat" "${DEPENDENCIES_DIR_WIN}/mmtk" "${TARGET_DIR}" "${MSVC_BUILD_TARGET}"
cd .. cd ..
rm -rf mmtk rm -rf mmtk
...@@ -230,4 +232,4 @@ if [ $status -ne 0 ]; then ...@@ -230,4 +232,4 @@ if [ $status -ne 0 ]; then
exit $status exit $status
fi fi
exit 0 exit 0
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment