[issm-svn] r23381 - in issm/trunk: externalpackages/gmt jenkins packagers/macosx

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-10-03 11:29:52 -0700 (Wed, 03 Oct 2018)
New Revision: 23381

Added:
   issm/trunk/externalpackages/gmt/install-mac-precompiled.sh
Modified:
   issm/trunk/jenkins/macosx_pine-island_static
   issm/trunk/packagers/macosx/package.sh
Log:
CHG: Mac binaries utilized precompiled copy of GMT (for now)

Added: issm/trunk/externalpackages/gmt/install-mac-precompiled.sh
===================================================================
--- issm/trunk/externalpackages/gmt/install-mac-precompiled.sh	                        (rev 0)
+++ issm/trunk/externalpackages/gmt/install-mac-precompiled.sh	2018-10-03 18:29:52 UTC (rev 23381)
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -eu
+
+# Set gmt version
+VER="5.4.4"
+
+# Set tarball name
+TARBALL_NAME="gmt-${VER}-mac-precompiled"
+TARBALL=${TARBALL_NAME}.tar.gz
+
+# Clean up from previous installation
+rm -rf install
+
+# Download Mac precompiled gmsh from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${TARBALL}" "${TARBALL}"
+
+# Untar gmt
+tar -xvzf $TARBALL
+
+# Rename untarred dir
+mv $TARBALL_NAME install
+
+# Clean up
+rm -f $TARBALL


Property changes on: issm/trunk/externalpackages/gmt/install-mac-precompiled.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: issm/trunk/jenkins/macosx_pine-island_static
===================================================================
--- issm/trunk/jenkins/macosx_pine-island_static	2018-10-03 16:44:43 UTC (rev 23380)
+++ issm/trunk/jenkins/macosx_pine-island_static	2018-10-03 18:29:52 UTC (rev 23381)
@@ -24,7 +24,6 @@
 	--with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
 	--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
 PYTHON_TEST=0
@@ -41,10 +40,7 @@
 					petsc		install-3.6-macosx64-static.sh
 					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"
 

Modified: issm/trunk/packagers/macosx/package.sh
===================================================================
--- issm/trunk/packagers/macosx/package.sh	2018-10-03 16:44:43 UTC (rev 23380)
+++ issm/trunk/packagers/macosx/package.sh	2018-10-03 18:29:52 UTC (rev 23381)
@@ -1,12 +1,29 @@
 #!/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 .
 else
@@ -13,7 +30,17 @@
 	echo "gmsh not found"
 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
 /Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
@@ -25,20 +52,19 @@
 	echo "test101 passed"
 fi
 
-tarball_name='issm-mac-static_build.tar.gz'
-
-echo "Cleanup first" 
+echo "Creating tarball: ${TARBALL_NAME}"
 cd $ISSM_DIR
-rm $tarball_name
-
-echo "Creating tarball: ${tarball_name}"
-cd $ISSM_DIR
-rm -rf trunk
-mkdir trunk
+rm -f $TARBALL
 cp -rf bin lib test examples scripts trunk/
-tar -czf $tarball_name trunk
-ls -lah $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
+
+tar -czf $TARBALL trunk
+ls -lah $TARBALL
+
 echo "Shipping binaries to website"
 
 # We're using public key authentication method to upload the tarball The
@@ -55,7 +81,7 @@
 source ~/.ssh/agent.sh
 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
 	echo "The upload failed."