Changeset 24676 for issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh

Timestamp:

03/31/20 12:42:27 (5 years ago)

Author:

jdquinn

Message:

CHG: Support for Mac binaries

File:

• issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh (modified) (3 diffs)

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh ¶

@@ -4 +4 @@
 ## Constants
 #
-LIBGFORTRAN="/usr/local/gfortran/lib/libgfortran.3.dylib" # Important that this is the library itself
-LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.3.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
-MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,244,250,417,444,445]" # Exclude any tests with transient solutions that require a restart
-MATLAB_PATH="/Applications/MATLAB_R2015b.app"
+MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,244,250,417,435,444,445,701,702,703]" # Exclude any tests with transient solutions that require a restart, and any tests that are excluded in the standard build
+MATLAB_PATH="/Applications/MATLAB_R2018a.app"
 PACKAGE="ISSM" # Name of directory to copy distributable files to
 
@@ -13 +11 @@
 #
 # NOTE:
-# - All non-excluded tests were running until recent changes to QMU
 # - 418 fails with "malloc(): invalid next size (unsorted)""
 #
-PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 244 250 417 418 444 445"
+PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 244 250 417 418 435 444 445 701 702 703"
 TARBALL_NAME="issm-mac-with_dakota"
 TARBALL="${TARBALL_NAME}.tar.gz"
@@ -44 +41 @@
         exit 1
 fi
-
-# Add/modify required libraries
-echo "Moving libgfortran to lib/"
-cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2> /dev/null
 
 # Run tests