Changeset 25782

Timestamp:

11/24/20 19:06:16 (4 years ago)

Author:

jdquinn

Message:

CHG: Corrected paths on Pine Island; documentation

Location:

issm/trunk-jpl

Files:

• jenkins/pine_island-mac-binaries-matlab (modified) (1 diff)
• jenkins/pine_island-mac-binaries-python (modified) (1 diff)
• packagers/mac/package-issm-mac-binaries-matlab.sh (modified) (1 diff)
• packagers/mac/package-issm-mac-binaries-python.sh (modified) (1 diff)

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

@@ -19 +19 @@
         --disable-dependency-tracking \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-fortran-lib="/usr/local/Cellar/gcc/10.2.0/lib/gcc/10/libgfortran.a /usr/local/Cellar/gcc/10.2.0/lib/gcc/10/libquadmath.a /usr/local/Cellar/gcc/10.2.0/lib/gcc/10/gcc/x86_64-apple-darwin19/10.2.0/libgcc.a" \
+        --with-fortran-lib="/usr/local/Cellar/gcc/10.2.0/lib/gcc/10/libgfortran.a /usr/local/Cellar/gcc/10.2.0/lib/gcc/10/libquadmath.a /usr/local/Cellar/gcc/10.2.0/lib/gcc/10/gcc/x86_64-apple-darwin15/10.2.0/libgcc.a" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

issm/trunk-jpl/jenkins/pine_island-mac-binaries-python

@@ -17 +17 @@
         --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
         --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
-        --with-fortran-lib="/usr/local/Cellar/gcc/10.2.0/lib/gcc/10/libgfortran.a /usr/local/Cellar/gcc/10.2.0/lib/gcc/10/libquadmath.a /usr/local/Cellar/gcc/10.2.0/lib/gcc/10/gcc/x86_64-apple-darwin19/10.2.0/libgcc.a" \
+        --with-fortran-lib="/usr/local/Cellar/gcc/10.2.0/lib/gcc/10/libgfortran.a /usr/local/Cellar/gcc/10.2.0/lib/gcc/10/libquadmath.a /usr/local/Cellar/gcc/10.2.0/lib/gcc/10/gcc/x86_64-apple-darwin15/10.2.0/libgcc.a" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh

@@ -137 +137 @@
                 fi
 
-                # Clean up from previous packaging (not necessary for single builds on Jenkins, 
-                # but useful when testing packaging locally)
+                # Clean up from previous packaging
                 echo "Cleaning up existing assets"
                 cd ${ISSM_DIR}

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh

@@ -130 +130 @@
 if [ ${transfer_only} -eq 0 ]; then
         if [ ${notarize_only} -eq 0 ]; then
-                # Clean up from previous packaging (not necessary for single builds on 
-                # Jenkins, but useful when testing packaging locally)
+                # Clean up from previous packaging
                 echo "Cleaning up existing assets"
                 cd ${ISSM_DIR}