Index: /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh (revision 28174) +++ /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh (revision 28175) @@ -34,4 +34,7 @@ ## Constants # +MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +MATLAB_PATH="/usr/local/MATLAB/R2023b" + PKG="ISSM-Linux-MATLAB" # Name of directory to copy distributable files to @@ -41,4 +44,6 @@ # export COMPRESSED_PKG +export MATLAB_NROPTIONS +export MATLAB_PATH export PKG Index: /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python-3.sh (revision 28174) +++ /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python-3.sh (revision 28175) @@ -35,4 +35,5 @@ # PKG="ISSM-Linux-Python-3" # Name of directory to copy distributable files to +PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 456 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 2424 2425 3001:3300 3480 3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded COMPRESSED_PKG="${PKG}.tar.gz" @@ -42,4 +43,5 @@ export COMPRESSED_PKG export PKG +export PYTHON_NROPTIONS ## Parse options Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 28174) +++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 28175) @@ -33,6 +33,4 @@ LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it -MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded -MATLAB_PATH="/usr/local/MATLAB/R2019b" ## Environment @@ -100,6 +98,6 @@ echo "Moving GMT binaries to bin/" if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then - cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . - cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . + cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null + cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null else echo "GMT not found" Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 28174) +++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 28175) @@ -33,5 +33,4 @@ LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it -PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 456 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 2424 2425 3001:3300 3480 3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded ## Environment @@ -93,6 +92,6 @@ echo "Moving GMT binaries to bin/" if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then - cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . - cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . + cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null + cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null else echo "GMT not found" Index: /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh (revision 28174) +++ /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh (revision 28175) @@ -64,5 +64,5 @@ ## Constants # -MATLAB_NROPTIONS="'benchmark','all','exclude',[119,124:126,129,216,234,235,274,418,420,423,430,433,435,441:442,444:445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2005,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2110,2111,2112,2113,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +MATLAB_NROPTIONS="'benchmark','all','exclude',[119,124:126,129,216,234:235,274,418,420,423,430,433,435,441:442,444:445,448,456,462:464,470:476,508,517,544,546,701:703,808,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002:2008,2010:2013,2020:2021,2051:2053,2084:2085,2090:2092,2101,2110:2113,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded MATLAB_PATH="/Applications/MATLAB_R2023b.app" PKG="ISSM-macOS-Silicon-MATLAB" # Name of directory to copy distributable files to Index: /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-python-3.sh (revision 28174) +++ /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-python-3.sh (revision 28175) @@ -65,5 +65,5 @@ # PKG="ISSM-macOS-Silicon-Python-3" # Name of directory to copy distributable files to -PYTHON_NROPTIONS="--benchmark all --exclude 119 124:126 129 216 234:235 274 418 420 423 430 433 435 441:442 444:445 448 456 462:464 508 517 544 546 701:703 808 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002:2008 2010:2013 2020:2021 2051:2053 2084:2085 2090:2092 2101 2110:2113 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +PYTHON_NROPTIONS="--benchmark all --exclude 119 124:126 129 216 234:235 274 418 420 423 430 433 435 441:442 444:445 448 456 462:464 470:476 508 517 544 546 701:703 808 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002:2008 2010:2013 2020:2021 2051:2053 2084:2085 2090:2092 2101 2110:2113 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded REPO_BASE_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/silicon/python/3" SIGNED_REPO_COPY="./signed" Index: /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 28174) +++ /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 28175) @@ -35,5 +35,5 @@ # path. # -alias svn='/usr/local/bin/svn' +alias svn=$(which svn) ## Override certain other aliases @@ -111,6 +111,6 @@ echo "Moving GMT binaries to bin/" if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then - cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . - cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . + cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null + cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null else echo "GMT not found" Index: /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 28174) +++ /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 28175) @@ -8,6 +8,6 @@ # for some reason but build is valid. # -# NOTE: -# - Assumes that the following constants are defined, +# NOTE: The following variables *must* be defined in order for this script to +# work properly, # # COMPRESSED_PKG @@ -34,8 +34,9 @@ # path. # -alias svn='/usr/local/bin/svn' +alias svn=$(which svn) ## Override certain other aliases # +alias cp=$(which cp) alias grep=$(which grep) @@ -103,6 +104,6 @@ echo "Moving GMT binaries to bin/" if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then - cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . - cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . + cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null + cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null else echo "GMT not found" Index: /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries.sh (revision 28174) +++ /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries.sh (revision 28175) @@ -58,14 +58,4 @@ # Expand aliases within the context of this script shopt -s expand_aliases - -# NOTE: For some reason, calling svn from within the context of this script -# gives, -# -# svn: command not found -# -# even though it is installed via Homebrew and available at the following -# path. -# -alias svn='/usr/local/bin/svn' ## Override certain other aliases Index: /issm/trunk-jpl/packagers/mac/transfer-issm-mac-binaries.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/transfer-issm-mac-binaries.sh (revision 28174) +++ /issm/trunk-jpl/packagers/mac/transfer-issm-mac-binaries.sh (revision 28175) @@ -19,21 +19,4 @@ # Expand aliases within the context of this script shopt -s expand_aliases - -# From https://developer.apple.com/documentation/macos-release-notes/macos-catalina-10_15-release-notes, -# -# Command line tool support for Subversion — including svn, git-svn, and -# related commands — is no longer provided by Xcode. (50266910) -# -# which results in, -# -# svn: error: The subversion command line tools are no longer provided by -# Xcode. -# -# when calling svn, even when subversion is installed via Homebrew and its path -# is available in PATH. -# -# NOTE: May be able to remove this after updating macOS. -# -#alias svn='/usr/local/bin/svn' ## Override certain other aliases