Changeset 27946

Timestamp:

10/06/23 19:41:50 (18 months ago)

Author:

jdquinn

Message:

BUG: Missed in last commit

File:

• issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab (copied) (copied from issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic ) (4 diffs)

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

@@ -3 +3 @@
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
-        --enable-development \
-        --enable-debugging \
-        --with-numthreads=4 \
+        --enable-standalone-executables \
+        --enable-standalone-modules \
+        --enable-standalone-libraries \
+        --disable-dependency-tracking \
         --with-vendor="win-msys2" \
         --with-matlab-dir="${MATLAB_PATH}" \
+        --with-fortran-lib="-Wl,-L/c/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/10.2.0 -Wl,-lgfortran" \
         --with-mpi-include="${MSMPI_ROOT}/include" \
-        --with-mpi-libdir="${MSMPI_ROOT}/lib" \
-        --with-mpi-libflags="-lmsmpi" \
-        --with-fortran-lib="-L/c/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/10.2.0/ -lgfortran" \
+        --with-mpi-libdir="-Wl,-L${MSMPI_ROOT}/lib" \
+        --with-mpi-libflags="-Wl,-lmsmpi" \
         --with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
         --with-parmetis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
@@ -30 +31 @@
 #List of external packages to be installed and their installation scripts
 EXTERNALPACKAGES="
-        msmpi           install.sh
-        petsc           install-3.14-win-msys2-mingw-msmpi.sh
-        triangle        install-win-msys2-mingw.sh
+        msmpi           install-static.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
@@ -44 +45 @@
 
 # Test suites
-MATLAB_TEST=1
+MATLAB_TEST=0
 PYTHON_TEST=0
 JAVASCRIPT_TEST=0
@@ -61 +62 @@
 # Nightly run options
 #
-# See documentation in test/NightlyRun/runme.* for more information
-#
-# NOTE:
-# - Tests 125, 126, and 129 are skipped because restart is not yet implemented 
-#       for Windows (under MSYS2)
-# - test701 is skipped because it uses full Stokes equations
-#
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),125,126,129,435,701,702,703]"
+MATLAB_NROPTIONS=""
 PYTHON_NROPTIONS=""