[issm-svn] r22788 - in issm/trunk: jenkins packagers/macosx packagers/ubuntu

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2018-05-15 15:56:49 -0700 (Tue, 15 May 2018)
New Revision: 22788

Modified:
   issm/trunk/jenkins/linux64_ross_static
   issm/trunk/jenkins/macosx_pine-island_static
   issm/trunk/packagers/macosx/package.sh
   issm/trunk/packagers/ubuntu/package.sh
Log:
CHG: trying out ubuntu and cleaning up install of macOSX

Modified: issm/trunk/jenkins/linux64_ross_static
===================================================================
--- issm/trunk/jenkins/linux64_ross_static	2018-05-15 22:44:59 UTC (rev 22787)
+++ issm/trunk/jenkins/linux64_ross_static	2018-05-15 22:56:49 UTC (rev 22788)
@@ -22,6 +22,7 @@
 	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
+	--with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
 	--with-numthreads=4'
 
@@ -40,6 +41,8 @@
 						m1qn3        install.sh
 						petsc        install-3.7-linux64-static.sh
 						triangle     install-linux64.sh
+						math77        install.sh
+						gmsh          install-static.sh
 						shell2junit  install.sh"
 
 #-----------------#

Modified: issm/trunk/jenkins/macosx_pine-island_static
===================================================================
--- issm/trunk/jenkins/macosx_pine-island_static	2018-05-15 22:44:59 UTC (rev 22787)
+++ issm/trunk/jenkins/macosx_pine-island_static	2018-05-15 22:56:49 UTC (rev 22788)
@@ -42,11 +42,6 @@
 						triangle     install-macosx64.sh
 						math77        install.sh
 						gmsh          install-static.sh
-						hdf5          install.sh
-						netcdf        install.sh
-						gdal          install-1.10-linux64-nopython.sh
-						gshhg         install.sh
-						gmt           install-static.sh
 						shell2junit  install.sh"
 
 #for SLR we need gmsh to mesh, math77, and gmt (which itself needs gdal and netcdf...)

Modified: issm/trunk/packagers/macosx/package.sh
===================================================================
--- issm/trunk/packagers/macosx/package.sh	2018-05-15 22:44:59 UTC (rev 22787)
+++ issm/trunk/packagers/macosx/package.sh	2018-05-15 22:56:49 UTC (rev 22788)
@@ -12,12 +12,6 @@
 else
 	echo "gmsh not found"
 fi
-echo "move gmt to bin" 
-if [ -f ../externalpackages/gmt/install/bin/gmt ]; then
-	cp ../externalpackages/gmt/install/bin/gmt .
-else
-	echo "gmt not found"
-fi
 
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
@@ -31,7 +25,6 @@
 	echo "test101 passed"
 fi
 
-#Package using the Package Maker from OSX, driven by command line.
 tarball_name='issm-mac-static_build.tar.gz'
 
 echo "Cleanup first" 
@@ -42,7 +35,6 @@
 cd $ISSM_DIR
 rm -rf trunk
 mkdir trunk
-#Need script to download data
 cp -rf bin lib test examples scripts trunk/
 tar -czf $tarball_name trunk
 ls -lah $tarball_name

Modified: issm/trunk/packagers/ubuntu/package.sh
===================================================================
--- issm/trunk/packagers/ubuntu/package.sh	2018-05-15 22:44:59 UTC (rev 22787)
+++ issm/trunk/packagers/ubuntu/package.sh	2018-05-15 22:56:49 UTC (rev 22788)
@@ -6,6 +6,12 @@
 echo "move mpiexec to bin" 
 cp ../externalpackages/mpich/install/bin/mpiexec .
 cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
+echo "move gmsh to bin" 
+if [ -f ../externalpackages/gmsh/install/gmsh ]; then
+	cp ../externalpackages/gmsh/install/gmsh .
+else
+	echo "gmsh not found"
+fi
 
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
@@ -29,7 +35,7 @@
 cd $ISSM_DIR
 rm -rf trunk
 mkdir trunk
-cp -rf bin lib test examples trunk/
+cp -rf bin lib test examples scripts trunk/
 tar -czf $tarball_name trunk
 ls -lah $tarball_name