[issm-svn] r22774 - in issm/trunk: externalpackages/gdal externalpackages/mpich jenkins

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2018-05-15 09:55:52 -0700 (Tue, 15 May 2018)
New Revision: 22774

Removed:
   issm/trunk/externalpackages/gdal/install-1.6-linux64-murdo.sh
   issm/trunk/externalpackages/gdal/install-1.6-macosx64.sh
Modified:
   issm/trunk/externalpackages/mpich/install-3.2-macosx64-static.sh
   issm/trunk/jenkins/macosx_pine-island_static
Log:
CHG: trying to install packages for workshop

Deleted: issm/trunk/externalpackages/gdal/install-1.6-linux64-murdo.sh
===================================================================
--- issm/trunk/externalpackages/gdal/install-1.6-linux64-murdo.sh	2018-05-15 15:37:07 UTC (rev 22773)
+++ issm/trunk/externalpackages/gdal/install-1.6-linux64-murdo.sh	2018-05-15 16:55:52 UTC (rev 22774)
@@ -1,39 +0,0 @@
-#!/bin/bash
-set -eu
-
-#Some cleanup
-rm -rf src
-rm -rf install
-rm -rf gdal-1.6.0
-mkdir src install
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gdal-1.6.0.tar.gz' 'gdal-1.6.0.tar.gz'
-
-#Untar 
-tar -zxvf  gdal-1.6.0.tar.gz
-
-#Move gdal into src directory
-mv gdal-1.6.0/* src
-rm -rf gdal-1.6.0
-
-#Configure gdal
-cd src
-./configure --prefix="$ISSM_DIR/externalpackages/gdal/install" \
-	--without-python \
-	--without-png \
-	--with-netcdf=no \
-	--with-jasper=no \
-	--without-ld-shared \
-	--with-unix-stdio-64=no 
-
-#Patch GDALmake.opt
-patch GDALmake.opt ../configs/GDALmake.opt.patch
-
-#Compile and install gdal
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
-make install

Deleted: issm/trunk/externalpackages/gdal/install-1.6-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/gdal/install-1.6-macosx64.sh	2018-05-15 15:37:07 UTC (rev 22773)
+++ issm/trunk/externalpackages/gdal/install-1.6-macosx64.sh	2018-05-15 16:55:52 UTC (rev 22774)
@@ -1,39 +0,0 @@
-#!/bin/bash
-set -eu
-
-#Some cleanup
-rm -rf src
-rm -rf install
-rm -rf gdal-1.6.0
-mkdir src install
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gdal-1.6.0.tar.gz' 'gdal-1.6.0.tar.gz'
-
-#Untar 
-tar -zxvf  gdal-1.6.0.tar.gz
-
-#Move gdal into src directory
-mv gdal-1.6.0/* src
-rm -rf gdal-1.6.0
-
-#Configure gdal
-cd src
-./configure \
-	--prefix="$ISSM_DIR/externalpackages/gdal/install" \
-	--without-python \
-	--without-png \
-	--with-netcdf=no \
-	--with-jasper=no \
-	--without-ld-shared \
-	--without-hdf5 \
-	--with-unix-stdio-64=no \
-	--with-expat=$ISSM_DIR/externalpackages/expat/install
-
-#Compile and install gdal
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
-make install

Modified: issm/trunk/externalpackages/mpich/install-3.2-macosx64-static.sh
===================================================================
--- issm/trunk/externalpackages/mpich/install-3.2-macosx64-static.sh	2018-05-15 15:37:07 UTC (rev 22773)
+++ issm/trunk/externalpackages/mpich/install-3.2-macosx64-static.sh	2018-05-15 16:55:52 UTC (rev 22774)
@@ -22,7 +22,8 @@
 #Configure mpich
 cd src
 ./configure \
-	--prefix="$ISSM_DIR/externalpackages/mpich/install"
+	--prefix="$ISSM_DIR/externalpackages/mpich/install" \
+	--disable-shared 
 
 #Compile mpich (this new version supports parallel make)
 if [ $# -eq 0 ]; then

Modified: issm/trunk/jenkins/macosx_pine-island_static
===================================================================
--- issm/trunk/jenkins/macosx_pine-island_static	2018-05-15 15:37:07 UTC (rev 22773)
+++ issm/trunk/jenkins/macosx_pine-island_static	2018-05-15 16:55:52 UTC (rev 22774)
@@ -44,7 +44,8 @@
 						gmsh          install-static.sh
 						hdf5          install.sh
 						netcdf        install.sh
-						gdal          install-1.10-linux64.sh
+						gdal          install-1.10-linux64-nopython.sh
+						gshhg         install.sh
 						gmt           install-static.sh
 						shell2junit  install.sh"