Changeset 28004

Timestamp:

11/08/23 11:10:24 (17 months ago)

Author:

jdquinn

Message:

CHG: Reverting move to more DLL’s for Windows dist. Issue is with MATLAB version.

Location:

issm/trunk-jpl

Files:

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

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

@@ -3 +3 @@
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
+        --enable-standalone-executables \
+        --enable-standalone-modules \
+        --enable-standalone-libraries \
         --disable-dependency-tracking \
         --with-vendor="win-msys2" \
@@ -29 +32 @@
 EXTERNALPACKAGES="
         msmpi           install-static.sh
-        petsc           install-3.14-win-msys2-mingw-msmpi.sh
-        triangle        install-win-msys2-mingw.sh
+        petsc           install-3.14-win-msys2-mingw-msmpi-static.sh
+        triangle        install-win-msys2-mingw-static.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"
-PETSC_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
-TRIANGLE_ROOT="${ISSM_DIR}/externalpackages/triangle/install"
 
 ## Environment
@@ -89 +87 @@
 else
         echo "MSMPI not found"
-        exit 1
-fi
-
-echo "Moving PETSc library to bin/"
-if [ -f ${PETSC_ROOT}/lib/libpetsc.dll ]; then
-        cp ${PETSC_ROOT}/lib/*.dll .
-else
-        echo "Triangle not found"
-        exit 1
-fi
-
-echo "Moving Triangle library to bin/"
-if [ -f ${TRIANGLE_ROOT}/lib/libtriangle.dll ]; then
-        cp ${TRIANGLE_ROOT}/lib/libtriangle.dll .
-else
-        echo "Triangle not found"
         exit 1
 fi