Changeset 27999

Timestamp:

11/06/23 10:19:30 (17 months ago)

Author:

jdquinn

Message:

BUG: Attempting to correct problems with Windows dist by using DLL version of libtriangle

Location:

issm/trunk-jpl

Files:

• jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab (modified) (1 diff)
• packagers/win/package-issm-win-binaries-matlab.sh (modified) (2 diffs)

issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab

@@ -33 +33 @@
         msmpi           install-static.sh
         petsc           install-3.14-win-msys2-mingw-msmpi-static.sh
-        triangle        install-win-msys2-mingw-static.sh
+        triangle        install-win-msys2-mingw.sh
         chaco           install-win-msys2-mingw.sh
         m1qn3           install.sh

issm/trunk-jpl/packagers/win/package-issm-win-binaries-matlab.sh

@@ -34 +34 @@
 MATLAB_PATH=$(cygpath -u $(cygpath -ms "/c/Program Files/MATLAB/R2019b"))
 MSMPI_ROOT="${ISSM_DIR}/externalpackages/msmpi/install"
+TRIANGLE_ROOT="${ISSM_DIR}/externalpackages/triangle/install"
 
 ## Environment
@@ -87 +88 @@
 else
         echo "MSMPI not found"
+        exit 1
+fi
+
+echo "Moving Triangle library to bin/"
+if [ -f ${TRIANGLE_ROOT}/libtriangle.dll ]; then
+        cp ${TRIANGLE_ROOT}/libtriangle.dll .
+else
+        echo "Triangle not found"
         exit 1
 fi