Changeset 24467

Timestamp:

12/11/19 15:33:23 (5 years ago)

Author:

jdquinn

Message:

CHG: New config for triangle on Linux/Mac (will not change anything until m4/issm_options.m4 has been updated)

File:

• issm/trunk-jpl/externalpackages/triangle/install-javascript.sh (modified) (2 diffs)

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

@@ -6 +6 @@
 # - Revisit enviroment variables (especially EMCC_CFLAGS) once support for
 #       Fortran has been accomplished.
+# - After discussing with group, uncomment the following lines to replace the
+#       existing ones (where applicable).
 #
 
@@ -24 +26 @@
 source ${ISSM_DIR}/externalpackages/emscripten/install/emsdk_env.sh
 
-# Cleanup
-rm -rf ${INSTALL_DIR} src
-mkdir ${INSTALL_DIR} ${INSTALL_DIR}/include ${INSTALL_DIR}/share src
+#Some cleanup
+rm -rf install-javascript triangle
+mkdir install-javascript
 
-# Download source
-${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/triangle.zip" "triangle.zip"
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/triangle.zip' 'triangle.zip'
 
-# Unpack source
-unzip triangle.zip -d src
+#Untar
+cd install-javascript
+cp ../triangle.zip ./
+unzip triangle.zip
 
-# Copy customized source files to 'src' directory
-cp configs/makefile src
-cp configs/javascript/configure.make src
-cp configs/javascript/triangle.h src
+#copy new makefile
+cp ../configs/javascript/configure.make ./
+cp ../configs/javascript/makefile ./
 
-# Compile
-cd src
-make objects
+#Patch triangle.h
+patch triangle.h ../triangle.h.patch.js
 
-# Install
-cd ..
-cp src/triangle.o ${INSTALL_DIR}/share
-cp src/triangle.h ${INSTALL_DIR}/include
+#Compile triangle
+make
 
-# Cleanup
-rm -rf src
+# # Cleanup
+# rm -rf ${INSTALL_DIR} src
+# mkdir ${INSTALL_DIR} ${INSTALL_DIR}/include ${INSTALL_DIR}/share src
+
+# # Download source
+# ${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/triangle.zip" "triangle.zip"
+
+# # Unpack source
+# unzip triangle.zip -d src
+
+# # Copy customized source files to 'src' directory
+# cp configs/makefile src
+# cp configs/javascript/configure.make src
+# cp configs/javascript/triangle.h src
+
+# # Compile
+# cd src
+# make objects
+
+# # Install
+# cd ..
+# cp src/triangle.o ${INSTALL_DIR}/share
+# cp src/triangle.h ${INSTALL_DIR}/include
+
+# # Cleanup
+# rm -rf src