Index: ../trunk-jpl/jenkins/jenkins.sh =================================================================== --- ../trunk-jpl/jenkins/jenkins.sh (revision 21928) +++ ../trunk-jpl/jenkins/jenkins.sh (revision 21929) @@ -181,6 +181,14 @@ exit 1; fi + +source $ISSM_DIR/etc/environment.sh + +if [ "$OS" == "win" ]; then + echo " == WINDOWS ENVIRONMENT DETECTED ==" + source $ISSM_DIR/externalpackages/windows/windows_environment.sh +fi + #Set CXX/CC flags for JS runs after exnteralpackages to avoid conflicts during their compilation CXX_PREVIOUS=$CXX CC_PREVIOUS=$CC @@ -187,14 +195,8 @@ if [ $JAVASCRIPT_TEST -eq 1 ]; then export CXX=em++ export CC=emcc + source $ISSM_DIR/externalpackages/emscripten/src/emsdk_env.sh fi - -source $ISSM_DIR/etc/environment.sh - -if [ "$OS" == "win" ]; then - echo " == WINDOWS ENVIRONMENT DETECTED ==" - source $ISSM_DIR/externalpackages/windows/windows_environment.sh -fi #}}} #ISSM compilation yes/no (ISSM_COMPILATION) {{{ if [ "$ISSM_COMPILATION" == "yes" ]