[issm-svn] r23385 - in issm/trunk: externalpackages/gmsh externalpackages/gmt jenkins packagers/win10
jdquinn at issm.ess.uci.edu
jdquinn at issm.ess.uci.edu
Thu Oct 4 17:11:03 PDT 2018
Author: jdquinn
Date: 2018-10-04 17:11:03 -0700 (Thu, 04 Oct 2018)
New Revision: 23385
Added:
issm/trunk/externalpackages/gmt/install-win64-precompiled.sh
Modified:
issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh
issm/trunk/jenkins/windows_static
issm/trunk/packagers/win10/package64.sh
Log:
CHG: Modified Windows 10 build and packager to use precompiled versions of gmsh and gmt
Modified: issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh
===================================================================
--- issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh 2018-10-04 21:55:21 UTC (rev 23384)
+++ issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh 2018-10-05 00:11:03 UTC (rev 23385)
@@ -2,22 +2,23 @@
set -eu
# Set gmsh version
-GMSH_VER="3.0.5"
+VER="3.0.5"
# Set tarball name
-GMSH_TARBALL_NAME="gmsh-${GMSH_VER}-win64-precompiled"
+TARBALL_NAME="gmsh-${VER}-win64-precompiled"
+TARBALL=${TARBALL_NAME}.tar.gz
# Clean up from previous installation
-rm -f $GMSH_TARBALL_NAME.tar.gz
-rm -rf install src
+rm -rf install
# 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"
+$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${TARBALL}" "${TARBALL}"
# Untar gmsh
-tar -xvzf $GMSH_TARBALL_NAME.tar.gz
+tar -xvzf $TARBALL
-# Copy gmsh to path expected by packager
-mkdir install
-cp gmsh.exe install
-rm gmsh.exe
+# Rename untarred dir
+mv $TARBALL_NAME install
+
+# Clean up
+rm -f $TARBALL
Added: issm/trunk/externalpackages/gmt/install-win64-precompiled.sh
===================================================================
--- issm/trunk/externalpackages/gmt/install-win64-precompiled.sh (rev 0)
+++ issm/trunk/externalpackages/gmt/install-win64-precompiled.sh 2018-10-05 00:11:03 UTC (rev 23385)
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -eu
+
+# Set gmt version
+VER="5.4.4"
+
+# Set tarball name
+TARBALL_NAME="gmt-${VER}-win64-precompiled"
+TARBALL=${TARBALL_NAME}.tar.gz
+
+# Clean up from previous installation
+rm -rf install
+
+# Download Windows 64-bit 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
Modified: issm/trunk/jenkins/windows_static
===================================================================
--- issm/trunk/jenkins/windows_static 2018-10-04 21:55:21 UTC (rev 23384)
+++ issm/trunk/jenkins/windows_static 2018-10-05 00:11:03 UTC (rev 23385)
@@ -8,25 +8,25 @@
#ISSM CONFIGURATION
ISSM_CONFIG='--prefix=$ISSM_DIR \
- --with-vendor=MSVC-Win64 \
- --with-cxxoptflags='-fp:strict' \
--disable-static \
+ --enable-standalone-executables \
--enable-standalone-libraries \
- --with-fortran=no \
+ --with-matlab-dir=$MATLAB_PATH \
+ --with-vendor=MSVC-Win64 \
+ --with-fortran=no \
--without-GiaIvins \
--without-Love \
--without-kriging \
--without-kml \
- --with-matlab-dir=$MATLAB_PATH \
- --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
- --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib \
+ --with-mpi-libdir=$ISSM_DIR/externalpackages/petsc/install/lib \
+ --with-mpi-libflags="-Wl,libpetsc.lib" \
--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
- --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/ \
- --with-mpi-libdir="$ISSM_DIR/externalpackages/petsc/install/lib" \
- --with-mpi-libflags="-Wl,libpetsc.lib" \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
--with-mpi-include="$ISSM_DIR/externalpackages/petsc/install/include/petsc/mpiuni" \
- --enable-development \
- --enable-debugging '
+ --with-cxxoptflags="-fp:strict"'
#PYTHON and MATLAB testing
MATLAB_TEST=0
@@ -38,11 +38,14 @@
#List of external pakages to be installed and their installation scripts
EXTERNALPACKAGES="autotools install-win.sh
- petsc install-3.6-win10.sh
- metis install-4.0-win10.sh
- triangle install-win10.sh
- gmsh install-win64-precompiled.sh
- shell2junit install.sh"
+ cmake install.sh
+ petsc install-3.6-win10.sh
+ metis install-4.0-win10.sh
+ triangle install-win10.sh
+ math77 install.sh
+ gmt install-win64-precompiled.sh
+ gmsh install-win64-precompiled.sh
+ shell2junit install.sh"
#-----------------#
# 4: test options #
Modified: issm/trunk/packagers/win10/package64.sh
===================================================================
--- issm/trunk/packagers/win10/package64.sh 2018-10-04 21:55:21 UTC (rev 23384)
+++ issm/trunk/packagers/win10/package64.sh 2018-10-05 00:11:03 UTC (rev 23385)
@@ -1,20 +1,27 @@
#!/bin/bash
+TARBALL_NAME='ISSM-Win10-64'
+TARBALL=$TARBALL_NAME.tar.gz
MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a"
# Source Windows environment
source $ISSM_DIR/externalpackages/windows/windows_environment.sh
+# Clean up from previous packaging
+echo "Cleaning up existing assets"
+cd $ISSM_DIR
+rm -rf trunk
+mkdir trunk
+
+# Add/modify required binaries
+cd $ISSM_DIR/bin
+
echo "Making generic_static.m work like generic.m"
-cd $ISSM_DIR/bin
cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
echo "Copying scripts from /src to /bin"
-echo "----------------------------------"
rm $ISSM_DIR/bin/*.m
find $ISSM_DIR/src/m -name '*.m' | xargs cp -t $ISSM_DIR/bin
-ls $ISSM_DIR/bin
-echo "----------------------------------"
echo "Copying gmsh to bin"
if [ -f ../externalpackages/gmsh/install/gmsh.exe ]; then
@@ -23,10 +30,20 @@
echo "gmsh not found"
fi
+# 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
+ 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 test 101 runs
cd $ISSM_DIR/test/NightlyRun
rm matlab.log
-
$MATLAB_PATH/bin/matlab -nodisplay -nosplash -r "try, addpath $ISSM_DIR_WIN/bin $ISSM_DIR_WIN/lib; runme('id',101); exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
# Wait until MATLAB closes
@@ -46,18 +63,22 @@
fi
# Create tarball
-TARBALL_NAME=ISSM-Win10-64.tar.gz
+echo "Creating tarball: ${TARBALL_NAME}"
+cd $ISSM_DIR
+rm -f $TARBALL
+cp -rf bin lib test examples scripts trunk/
+# Create link to gmt from bin
+# NOTE: It is important that we are in the destination dir when sym linking so that the path is relative
+if [ -f $ISSM_DIR/trunk/externalpackages/gmt/bin/gmt ]; then
+ cd $ISSM_DIR/trunk/bin
+ ln -s ../externalpackages/gmt/bin/gmt.exe ./gmt
+fi
+
cd $ISSM_DIR
-rm $TARBALL_NAME
-rm -rf trunk
-mkdir trunk
+tar -czf $TARBALL trunk
+ls -lah $TARBALL
-echo "Creating tarball: ${TARBALL_NAME}"
-cp -rf bin lib test examples scripts trunk/
-tar -czf $TARBALL_NAME trunk
-ls -lah $TARBALL_NAME
-
# Ship binaries to website
echo "Shipping binaries to website"
@@ -76,7 +97,7 @@
source ~/.ssh/agent.sh
ssh-add ~/.ssh/win_bins-geidi_prime_to_ross
-scp $TARBALL_NAME jenkins at ross.ics.uci.edu:/var/www/html/$TARBALL_NAME
+scp $TARBALL jenkins at ross.ics.uci.edu:/var/www/html/$TARBALL
if [ $? -ne 0 ]; then
echo "The upload failed."
More information about the issm-svn
mailing list