[issm-svn] r23364 - in issm/trunk: externalpackages/gmsh jenkins packagers/win10

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-10-01 15:38:31 -0700 (Mon, 01 Oct 2018)
New Revision: 23364

Added:
   issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh
Modified:
   issm/trunk/jenkins/windows_static
   issm/trunk/packagers/win10/package64.sh
Log:
CHG: Adding gmsh to Windows binaries

Added: issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh
===================================================================
--- issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh	                        (rev 0)
+++ issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh	2018-10-01 22:38:31 UTC (rev 23364)
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eu
+
+# Set gmsh version
+GMSH_VER="3.0.5"
+
+# Set tarball name
+GMSH_TARBALL_NAME="gmsh-${GMSH_VER}-win64-precompiled"
+
+# Clean up from previous installation
+rm -f $GMSH_TARBALL_NAME.tar.gz
+rm -rf install src
+
+# Download Windows 64-bit precompiled gmsh from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${GMSH_TARBALL_NAME}.tar.gz" "${GMSH_TARBALL_NAME}.tar.gz"
+
+# Untar gmsh
+tar -xvzf $GMSH_TARBALL_NAME.tar.gz
+
+# Copy gmsh to path expected by packager
+mkdir install
+cp gmsh.exe install
+rm gmsh.exe


Property changes on: issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: issm/trunk/jenkins/windows_static
===================================================================
--- issm/trunk/jenkins/windows_static	2018-10-01 21:46:53 UTC (rev 23363)
+++ issm/trunk/jenkins/windows_static	2018-10-01 22:38:31 UTC (rev 23364)
@@ -41,6 +41,7 @@
 						petsc       install-3.6-win10.sh
 						metis       install-4.0-win10.sh
 						triangle    install-win10.sh
+						gmsh 		install-win64-precompiled.sh
 						shell2junit install.sh"
 
 #-----------------#
@@ -58,7 +59,5 @@
 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-
-#In Windows, we don't yet have MUMPS, can't do full stokes, so exclude all FS runs. Also exclude all runs with Dakota. And exclude higher order runs that have penalties. And 800+ tests because we don't want to have --with-development since we do the binaries with this version
 MATLAB_NROPTIONS=""
 PYTHON_NROPTIONS=""

Modified: issm/trunk/packagers/win10/package64.sh
===================================================================
--- issm/trunk/packagers/win10/package64.sh	2018-10-01 21:46:53 UTC (rev 23363)
+++ issm/trunk/packagers/win10/package64.sh	2018-10-01 22:38:31 UTC (rev 23364)
@@ -16,6 +16,13 @@
 ls $ISSM_DIR/bin
 echo "----------------------------------"
 
+echo "Copying gmsh to bin"
+if [ -f ../externalpackages/gmsh/install/gmsh.exe ]; then
+	cp ../externalpackages/gmsh/install/gmsh.exe .
+else
+	echo "gmsh not found"
+fi
+
 # Check that test 101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log