Changeset 24466

Timestamp:

12/11/19 14:59:30 (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)

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/triangle/configs/linux (added)
• externalpackages/triangle/configs/linux/configure.make (added)
• externalpackages/triangle/configs/mac (added)
• externalpackages/triangle/configs/mac/configure.make (added)
• externalpackages/triangle/install-javascript.sh (modified) (2 diffs)
• externalpackages/triangle/install-linux-static.sh (added)
• externalpackages/triangle/install-linux.sh (added)
• externalpackages/triangle/install-mac-static.sh (added)
• externalpackages/triangle/install-mac.sh (added)
• m4/issm_options.m4 (modified) (3 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -444 +444 @@
         export REFPATTERNDIR="$NEOPZ_DIR/include/refpatterns"
 fi
+
+TRIANGLE_DIR="${ISSM_DIR}/externalpackages/triangle/install"
+ld_library_path_append "${TRIANGLE_DIR}/lib"

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

@@ -8 +8 @@
 #
 
+# Constants
+#
+INSTALL_DIR="install-javascript"
+
 # Environment
+#
 export CC=emcc
 export CXX=em++
@@ -17 +22 @@
 
 # Source Emscripten environment
-source $ISSM_DIR/externalpackages/emscripten/install/emsdk_env.sh
+source ${ISSM_DIR}/externalpackages/emscripten/install/emsdk_env.sh
 
-#Some cleanup
-rm -rf install-javascript triangle
-mkdir install-javascript
+# Cleanup
+rm -rf ${INSTALL_DIR} src
+mkdir ${INSTALL_DIR} ${INSTALL_DIR}/include ${INSTALL_DIR}/share src
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/triangle.zip' 'triangle.zip'
+# Download source
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/triangle.zip" "triangle.zip"
 
-#Untar
-cd install-javascript
-cp ../triangle.zip ./
-unzip triangle.zip
+# Unpack source
+unzip triangle.zip -d src
 
-#copy new makefile
-cp ../configs/javascript/configure.make ./
-cp ../configs/javascript/makefile ./
+# Copy customized source files to 'src' directory
+cp configs/makefile src
+cp configs/javascript/configure.make src
+cp configs/javascript/triangle.h src
 
-#Patch triangle.h
-patch triangle.h ../triangle.h.patch.js
+# Compile
+cd src
+make objects
 
-#Compile triangle
-make
+# Install
+cd ..
+cp src/triangle.o ${INSTALL_DIR}/share
+cp src/triangle.h ${INSTALL_DIR}/include
 
-
+# Cleanup
+rm -rf src

issm/trunk-jpl/m4/issm_options.m4

@@ -372 +372 @@
 
   dnl Check whether triangle is enabled
+  dnl TODO: After discussing with group, uncomment the following lines to
+  dnl           replace the existing ones (where applicable), update Jenkins config
+  dnl           files, then cleanup $ISSM_DIR/externalpackages/triangle.
         AC_MSG_CHECKING([for triangle])
         if test "x$TRIANGLE_ROOT" = "xno" ; then
@@ -383 +386 @@
                         AC_MSG_ERROR([Couldn't find triangle.h... check your installation of triangle])
                 fi
+                dnl if ! test -f "${TRIANGLE_ROOT}/include/triangle.h" ; then
+                        dnl AC_MSG_ERROR([Couldn't find triangle.h... check your installation of triangle])
+                dnl fi
         fi
         AC_MSG_RESULT($HAVE_TRIANGLE)
@@ -389 +395 @@
         dnl library and header files
         if test "x$HAVE_TRIANGLE" = "xyes"; then
-                TRIANGLEINCL=-I$TRIANGLE_ROOT/
+                TRIANGLEINCL=-I${TRIANGLE_ROOT}
+                dnl TRIANGLEINCL=-I${TRIANGLE_ROOT}/include
                 case "${host_os}" in
-                                *cygwin*)
-                                TRIANGLEINCL="/I`cygpath -m $TRIANGLE_ROOT/`"
-                                TRIANGLELIB="-Wl,`cygpath -m $TRIANGLE_ROOT/`triangle.lib"
-                                ;;
-                                *linux*)
-                                if test "x$HAVE_JAVASCRIPT" = "xyes"; then
-                                        dnl go to the bit code, not the library.
-                                        TRIANGLELIB=$TRIANGLE_ROOT/triangle.o
-                                else
-                                        TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
-                                fi
-                                ;;
-                                *darwin*)
-                                if test "x$HAVE_JAVASCRIPT" = "xyes"; then
-                                        dnl go to the bit code, not the library.
-                                        TRIANGLELIB=$TRIANGLE_ROOT/triangle.o
-                                else
-                                        TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
-                                fi
-                                ;;
-                        esac
+                        *cygwin*)
+                        TRIANGLEINCL="/I`cygpath -m $TRIANGLE_ROOT/`"
+                        TRIANGLELIB="-Wl,`cygpath -m $TRIANGLE_ROOT/`triangle.lib"
+                        ;;
+                        *linux*)
+                        if test "x$HAVE_JAVASCRIPT" = "xyes"; then
+                                dnl go to the bit code, not the library.
+                                TRIANGLELIB=${TRIANGLE_ROOT}/triangle.o
+                                dnl TRIANGLELIB=${TRIANGLE_ROOT}/share/triangle.o
+                        else
+                                TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
+                                dnl TRIANGLELIB="-L${TRIANGLE_ROOT}/lib -ltriangle"
+                        fi
+                        ;;
+                        *darwin*)
+                        if test "x$HAVE_JAVASCRIPT" = "xyes"; then
+                                dnl go to the bit code, not the library.
+                                TRIANGLELIB=$TRIANGLE_ROOT/triangle.o
+                                dnl TRIANGLELIB=${TRIANGLE_ROOT}/share/triangle.o
+                        else
+                                TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
+                                dnl TRIANGLELIB="-L${TRIANGLE_ROOT}/lib -ltriangle"
+                        fi
+                        ;;
+                esac
                 AC_DEFINE([_HAVE_TRIANGLE_],[1],[with Triangle in ISSM src])
                 AC_SUBST([TRIANGLEINCL])