source: issm/oecreview/Archive/21724-22754/ISSM-21928-21929.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 1.0 KB
RevLine 
[22755]1Index: ../trunk-jpl/jenkins/jenkins.sh
2===================================================================
3--- ../trunk-jpl/jenkins/jenkins.sh (revision 21928)
4+++ ../trunk-jpl/jenkins/jenkins.sh (revision 21929)
5@@ -181,6 +181,14 @@
6 exit 1;
7 fi
8
9+
10+source $ISSM_DIR/etc/environment.sh
11+
12+if [ "$OS" == "win" ]; then
13+ echo " == WINDOWS ENVIRONMENT DETECTED =="
14+ source $ISSM_DIR/externalpackages/windows/windows_environment.sh
15+fi
16+
17 #Set CXX/CC flags for JS runs after exnteralpackages to avoid conflicts during their compilation
18 CXX_PREVIOUS=$CXX
19 CC_PREVIOUS=$CC
20@@ -187,14 +195,8 @@
21 if [ $JAVASCRIPT_TEST -eq 1 ]; then
22 export CXX=em++
23 export CC=emcc
24+ source $ISSM_DIR/externalpackages/emscripten/src/emsdk_env.sh
25 fi
26-
27-source $ISSM_DIR/etc/environment.sh
28-
29-if [ "$OS" == "win" ]; then
30- echo " == WINDOWS ENVIRONMENT DETECTED =="
31- source $ISSM_DIR/externalpackages/windows/windows_environment.sh
32-fi
33 #}}}
34 #ISSM compilation yes/no (ISSM_COMPILATION) {{{
35 if [ "$ISSM_COMPILATION" == "yes" ]
Note: See TracBrowser for help on using the repository browser.