Changeset 26991

Timestamp:

05/05/22 19:14:06 (3 years ago)

Author:

jdquinn

Message:

BUG: ISSM_DIR variable

File:

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

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

@@ -65 +65 @@
 
 echo "Moving MPICH binaries to bin/"
-if [ -f ${ISSM_EXT_STATIC_DIR}/petsc/install/bin/mpiexec ]; then
-        cp ${ISSM_EXT_STATIC_DIR}/petsc/install/bin/mpiexec .
-        cp ${ISSM_EXT_STATIC_DIR}/petsc/install/bin/hydra_pmi_proxy .
-elif [ -f ${ISSM_EXT_STATIC_DIR}/mpich/install/bin/mpiexec ]; then
-        cp ${ISSM_EXT_STATIC_DIR}/mpich/install/bin/mpiexec .
-        cp ${ISSM_EXT_STATIC_DIR}/mpich/install/bin/hydra_pmi_proxy .
+if [ -f ${ISSM_DIR}/petsc/install/bin/mpiexec ]; then
+        cp ${ISSM_DIR}/petsc/install/bin/mpiexec .
+        cp ${ISSM_DIR}/petsc/install/bin/hydra_pmi_proxy .
+elif [ -f ${ISSM_DIR}/mpich/install/bin/mpiexec ]; then
+        cp ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec .
+        cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy .
 else
         echo "MPICH not found"
@@ -77 +77 @@
 
 echo "Moving GDAL binaries to bin/"
-if [ -f ${ISSM_EXT_STATIC_DIR}/gdal/install/bin/gdal-config ]; then
-        cp ${ISSM_EXT_STATIC_DIR}/gdal/install/bin/gdalsrsinfo .
-        cp ${ISSM_EXT_STATIC_DIR}/gdal/install/bin/gdaltransform .
+if [ -f ${ISSM_DIR}/externalpackages/gdal/install/bin/gdal-config ]; then
+        cp ${ISSM_DIR}/externalpackages/gdal/install/bin/gdalsrsinfo .
+        cp ${ISSM_DIR}/externalpackages/gdal/install/bin/gdaltransform .
 else
         echo "GDAL not found"
@@ -86 +86 @@
 
 echo "Moving GMT binaries to bin/"
-if [ -f ${ISSM_EXT_STATIC_DIR}/gmt/install/bin/gmt-config ]; then
-        cp ${ISSM_EXT_STATIC_DIR}/gmt/install/bin/gmt .
-        cp ${ISSM_EXT_STATIC_DIR}/gmt/install/bin/gmtselect .
+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 .
 else
         echo "GMT not found"
@@ -95 +95 @@
 
 echo "Moving Gmsh binaries to bin/"
-if [ -f ${ISSM_EXT_STATIC_DIR}/gmsh/install/bin/gmsh ]; then
-        cp ${ISSM_EXT_STATIC_DIR}/gmsh/install/bin/gmsh .
+if [ -f ${ISSM_DIR}/externalpackages/gmsh/install/bin/gmsh ]; then
+        cp ${ISSM_DIR}/externalpackages/gmsh/install/bin/gmsh .
 else
         echo "Gmsh not found"