Changeset 24632 for issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh

Timestamp:

03/03/20 13:58:31 (5 years ago)

Author:

jdquinn

Message:

CHG: Using PETSc 3.12 for Debian Linux builds; clean up

File:

• issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh (modified) (2 diffs)

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh

@@ -23 +23 @@
 echo "Modify generic"
 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
-rm generic_static.m
 
 echo "Moving MPICH binaries to bin/"
-if [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
+if [ -f ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec ]; then
+        cp ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec .
+        cp ${ISSM_DIR}/externalpackages/petsc/install/bin/hydra_pmi_proxy .
+elif [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
         cp ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec .
-        cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy
+        cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy .
 else
         echo "MPICH not found"
+        exit 1
 fi
 
@@ -80 +83 @@
 cp -rf bin examples lib scripts test ${PACKAGE}/
 echo "Cleaning up unneeded/unwanted files"
+rm -f ${PACKAGE}/bin/generic_static.* # Remove static versions of generic cluster classes
 rm -f ${PACKAGE}/lib/*.a # Remove static libraries from package
 rm -f ${PACKAGE}/lib/*.la # Remove libtool libraries from package