Changeset 24239

Timestamp:

10/16/19 23:28:08 (5 years ago)

Author:

jdquinn

Message:

CHG: Now grabbing latest version of Emscripten; moved Java assets to their own subdirectory

Location:

issm/trunk-jpl/externalpackages

Files:

• emscripten/install.sh (modified) (1 diff)
• java (added)
• java/yuicompressor-2.4.8.jar (added)
• javascript/README (added)
• javascript/compressor (deleted)
• javascript/gauge.min.js (added)
• javascript/gl-matrix-min.js (added)
• javascript/hammer.min.js (added)
• javascript/jquery.min.js (added)
• javascript/jsonfn.js (added)
• javascript/sprintf.js (added)
• javascript/src (deleted)

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

@@ -2 +2 @@
 set -eu
 
-export CC=gcc
-export CXX=g++
-
-#Some cleanup
+# Some cleanup
 rm -rf install
 
-#Download from ISSM server
+# Download source
 $ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/emsdk-portable.tar.gz' 'emsdk-portable.tar.gz'
 
-#Untar and move petsc to install directory
-tar -zxvf  emsdk-portable.tar.gz
+# Untar and move source to install directory
+tar -zxvf emsdk-portable.tar.gz
+
 mv emsdk_portable install
 
 cd install
 
+# Download and install the latest SDK tools
 ./emsdk update
-./emsdk install sdk-tag-1.34.12-64bit
-./emsdk activate sdk-tag-1.34.12-64bit
 
-#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.
+# Make the "latest" SDK "active" for the current user. (writes ~/.emscripten file)
+# NOTE: See revision history for version that we used to hard code in.
+./emsdk install latest
+./emsdk activate latest
+
+# Activate PATH and other environment variables in the current terminal
 source emsdk_env.sh