Changeset 28183

Timestamp:

03/25/24 20:09:51 (12 months ago)

Author:

jdquinn

Message:

CHG: Corrected configs; list of files to sign

Location:

issm/trunk-jpl

Files:

• jenkins/mac-silicon-binaries-matlab (modified) (1 diff)
• jenkins/mac-silicon-binaries-python-3 (modified) (2 diffs)
• packagers/mac/sign-issm-mac-binaries.sh (modified) (2 diffs)

issm/trunk-jpl/jenkins/mac-silicon-binaries-matlab

@@ -22 +22 @@
         --disable-dependency-tracking \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-python-version=3.9 \
-        --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
-        --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
         --with-fortran-lib="${LIBGFORTRAN_PATH}/libgfortran.a ${LIBGFORTRAN_PATH}/libquadmath.a ${LIBGCC_PATH}/libgcc.a" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \

issm/trunk-jpl/jenkins/mac-silicon-binaries-python-3

@@ -1 @@
-MATLAB_PATH="/Applications/MATLAB_R2023b.app"
 LIBGFORTRAN_PATH="/opt/homebrew/Cellar/gcc/13.2.0/lib/gcc/current"
 LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/aarch64-apple-darwin23/13"
@@ -21 +20 @@
         --enable-standalone-libraries \
         --disable-dependency-tracking \
-        --with-matlab-dir=${MATLAB_PATH} \
         --with-python-version=3.9 \
         --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \

issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries.sh

@@ -128 +128 @@
 ISSM_BINS=$(\
         find ${PKG}/bin -type f -name *.exe; \
+        find ${PKG}/bin -type f -name *.pyc; \
+        find ${PKG}/lib -type f -name *.mexmaca64; \
         find ${PKG}/lib -type f -name *.mexmaci64; \
         find ${PKG}/test -type f -name *.pkg; \
@@ -138 +140 @@
         echo ${PKG}/bin/gdalsrsinfo; \
         echo ${PKG}/bin/gdaltransform; \
+        echo ${PKG}/bin/gmsh; \
         echo ${PKG}/bin/gmt; \
-        echo ${PKG}/bin/gmtselect; \
-        echo ${PKG}/bin/gmsh; \
 )