Changeset 21926

Timestamp:

08/09/17 17:34:24 (8 years ago)

Author:

dlcheng

Message:

CHG: Addressing JS compilation issues.

Location:

issm/trunk-jpl

Files:

• externalpackages/emscripten/install.sh (modified) (1 diff)
• jenkins/jenkins.sh (modified) (4 diffs)
• jenkins/linux64_ross_javascript (modified) (1 diff)
• src/m/Makefile.am (modified) (1 diff)

issm/trunk-jpl/externalpackages/emscripten/install.sh

@@ -20 +20 @@
 ./emsdk install latest
 ./emsdk activate latest
+
+cd ../
+mv src install
+cd install
+
+source ./emsdk_env.sh

issm/trunk-jpl/jenkins/jenkins.sh

@@ -30 +30 @@
 MATLAB_TEST=0
 PYTHON_TEST=0
+JAVASCRIPT_TEST=0
 
 #source configuration script
@@ -141 +142 @@
 
         #install if requested or if previous install has not been successful
-        if [ "$ISSM_EXTERNALPACKAGES" == "yes" ] || [ ! -d ./install ] || [ ! "$(ls -A ./install)" ]; then
+        if [ "$ISSM_EXTERNALPACKAGES" == "yes" ] || [ ! -d ./install -a ! -d ./install-javascript ] || ([ -d ./install ] && [ ! "$(ls -A ./install)" ]) || ([ -d ./install-javascript ] && [ ! "$(ls -A ./install-javascript)" ]); then
                 echo "======================================================";
                 echo "       Installing $PACKAGENAME                        ";
@@ -181 +182 @@
 fi
 
+#Set CXX/CC flags for JS runs after exnteralpackages to avoid conflicts during their compilation
+CXX_PREVIOUS=$CXX
+CC_PREVIOUS=$CC
+if [ $JAVASCRIPT_TEST -eq 1 ]; then
+        export CXX=em++
+        export CC=emcc
+fi
+
 source $ISSM_DIR/etc/environment.sh
 
-if [ "$OS" == "win" ]
-then
+if [ "$OS" == "win" ]; then
         echo " == WINDOWS ENVIRONMENT DETECTED =="
         source $ISSM_DIR/externalpackages/windows/windows_environment.sh
@@ -238 +246 @@
 #}}}
 
+#Restore CXX/CC to their previous values 
+export CXX=$CXX_PREVIOUS
+export CC=$CC_PREVIOUS
+
 #matlab tests
 # {{{

issm/trunk-jpl/jenkins/linux64_ross_javascript

@@ -24 +24 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="gsl                     install-javascript.sh    
+EXTERNALPACKAGES="autotools     install.sh
+                                                cmake         install.sh
+                                                emscripten    install.sh        
+                                                gsl           install-javascript.sh    
                                                 triangle      install-javascript.sh        
-                                                shell2junit   install.sh
-                                                emscripten        install.sh"
+                                                shell2junit   install.sh"
 
 #-----------------#

issm/trunk-jpl/src/m/Makefile.am

@@ -135 +135 @@
                                 ${ISSM_DIR}/src/m/io/savemodel.js \
                                 ${ISSM_DIR}/src/m/io/loadmodel.js \
-                                ${ISSM_DIR}/src/m/io/saveAsFile.js \
                                 ${ISSM_DIR}/src/m/io/writetofile.js \
-                                ${ISSM_DIR}/src/m/io/download.js \
                                 ${ISSM_DIR}/src/m/io/writetofile.js \
                                 ${ISSM_DIR}/src/m/materials/paterson.js \