Changeset 21928

Timestamp:

08/09/17 18:25:47 (8 years ago)

Author:

dlcheng

Message:

CHG: Explicitly sourcing emscripten for gsl and triangle before compilation.

Location:

issm/trunk-jpl/externalpackages

Files:

• emscripten/install.sh (modified) (2 diffs)
• gsl/install-javascript.sh (modified) (1 diff)
• triangle/install-javascript.sh (modified) (1 diff)

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

@@ -12 +12 @@
 mv emsdk_portable src
 
-cd src
+cd src 
 
 export CXX=g++
@@ -21 +21 @@
 ./emsdk activate latest
 
-cd ../
-mv src install
-cd install
-
-source ./emsdk_env.sh
+#Related to moving the install path after installation - However, not safe to install in dir named "install" since a failure would not be noticed by jenkins when triggering
+#Not reliable - when executed in subshell without sourcing the install file, this has no effect. Safer to explicitly source for each dependent externalpackage.
+source emsdk_env.sh

issm/trunk-jpl/externalpackages/gsl/install-javascript.sh

@@ -21 +21 @@
 export CC=emcc
 export CXX=em++
+#Source emscripten to ensure emcc/em++ compiler are in env
+source $ISSM_DIR/externalpackages/emscripten/src/emsdk_env.sh
 
 # Issue with variadic function signatures.

issm/trunk-jpl/externalpackages/triangle/install-javascript.sh

@@ -8 +8 @@
 #Download from ISSM server
 $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
+
+#Source emscripten to ensure emcc/em++ compiler are in env
+source $ISSM_DIR/externalpackages/emscripten/src/emsdk_env.sh
 
 #Untar