Changeset 23381

Timestamp:

10/03/18 11:29:52 (6 years ago)

Author:

jdquinn

Message:

CHG: Mac binaries utilized precompiled copy of GMT (for now)

Location:

issm/trunk

Files:

• externalpackages/gmt/install-mac-precompiled.sh (added)
• jenkins/macosx_pine-island_static (modified) (2 diffs)
• packagers/macosx/package.sh (modified) (4 diffs)

issm/trunk/jenkins/macosx_pine-island_static

@@ -25 +25 @@
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a"'
 
-
 #PYTHON and MATLAB testing
 MATLAB_TEST=0
@@ -42 +41 @@
                                         triangle        install-macosx64.sh
                                         math77          install.sh
-                                        gshhg           install.sh
-                                        hdf5            install.sh
-                                        netcdf          install.sh
-                                        gmt                     install-static.sh
+                                        gmt                     install-mac-precompiled.sh
                                         gmsh            install-mac-precompiled.sh
                                         shell2junit     install.sh"

issm/trunk/packagers/macosx/package.sh

@@ -1 +1 @@
 #!/bin/bash
 
-echo "modify generic" 
+TARBALL_NAME='issm-mac-static_build'
+TARBALL=$TARBALL_NAME.tar.gz
+
+# Clean up from previous packaging
+echo "Cleaning up existing assets"
+cd $ISSM_DIR
+rm -rf trunk
+mkdir trunk trunk/externalpackages
+
+# Add/modify required binaries
 cd $ISSM_DIR/bin
+
+echo "Modifying generic"
 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
-echo "move mpiexec to bin" 
-cp ../externalpackages/mpich/install/bin/mpiexec .
-cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
-echo "move gmsh to bin" 
+
+echo "Moving mpiexec to bin"
+if [ -f ../externalpackages/mpich/install/bin/mpiexec ]; then
+        cp ../externalpackages/mpich/install/bin/mpiexec .
+        cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
+else
+        echo "mpich not found"
+fi
+
+echo "Moving gmsh to bin"
 if [ -f ../externalpackages/gmsh/install/gmsh ]; then
         cp ../externalpackages/gmsh/install/gmsh .
@@ -14 +31 @@
 fi
 
-#Check that test101 runs
+# Copy gmt to trunk
+# NOTE: The following assumes the precompiled version of gmt
+echo "Moving gmt to externalpackages"
+if [ -f $ISSM_DIR/externalpackages/gmt/install/bin/gmt ]; then
+        mkdir $ISSM_DIR/trunk/externalpackages/gmt
+        cp -a $ISSM_DIR/externalpackages/gmt/install/. $ISSM_DIR/trunk/externalpackages/gmt
+else
+        echo "gmt not found"
+fi
+
+# Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
@@ -26 +53 @@
 fi
 
-tarball_name='issm-mac-static_build.tar.gz'
+echo "Creating tarball: ${TARBALL_NAME}"
+cd $ISSM_DIR
+rm -f $TARBALL
+cp -rf bin lib test examples scripts trunk/
 
-echo "Cleanup first" 
-cd $ISSM_DIR
-rm $tarball_name
+# Create link to gmt from bin
+if [ -f $ISSM_DIR/trunk/externalpackages/gmt/bin/gmt ]; then
+        ln -s $ISSM_DIR/trunk/externalpackages/gmt/bin/gmt $ISSM_DIR/trunk/bin/gmt
+fi
 
-echo "Creating tarball: ${tarball_name}"
-cd $ISSM_DIR
-rm -rf trunk
-mkdir trunk
-cp -rf bin lib test examples scripts trunk/
-tar -czf $tarball_name trunk
-ls -lah $tarball_name
+tar -czf $TARBALL trunk
+ls -lah $TARBALL
 
 echo "Shipping binaries to website"
@@ -56 +82 @@
 ssh-add ~/.ssh/macosx-bins_richese-to-ross
 
-scp $tarball_name ross.ics.uci.edu:/var/www/html/$tarball_name
+scp $TARBALL ross.ics.uci.edu:/var/www/html/$TARBALL
 
 if [ $? -ne 0 ]; then