Changeset 24283

Timestamp:

10/28/19 15:23:48 (5 years ago)

Author:

jdquinn

Message:

CHG: Cleanup; now pulling source from our external packages repo

File:

• issm/trunk-jpl/externalpackages/gmsh/install.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/gmsh/install.sh

@@ -2 +2 @@
 set -eu
 
-#Some cleanup
+VER="3.0.5"
+
+# Cleanup
 rm -rf install src
-mkdir install
+mkdir install src
 
-#Download latest version
-#svn co --username gmsh --password gmsh https://geuz.org/svn/gmsh/trunk src
-#git clone http://gitlab.onelab.info/gmsh/gmsh.git src
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gmsh-${VER}-source.tgz" "gmsh-${VER}-source.tgz"
 
-#Set gmsh version
-GMSH_VER="3.0.5"
+# Untar source
+tar -xvzf gmsh-$VER-source.tgz
 
-#Remove tarball if it exists
-rm -f gmsh-$GMSH_VER-source.tgz
+# Move source to src directory
+mv gmsh-$VER-source/* src
+rm -rf gmsh-$VER-source
 
-#Download last stable version that we know works
-wget http://gmsh.info/src/gmsh-$GMSH_VER-source.tgz
+# Configure
+cd install
+cmake ../src \
+        -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" \
+        -DENABLE_MPI=1
 
-#Untar gmsh
-tar -xvzf gmsh-$GMSH_VER-source.tgz
-
-#Rename gmsh source directory
-mv gmsh-$GMSH_VER-source src
-
-#Configure
-cd install
-cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" -DENABLE_MPI=1
-
-#Compile and install
+# Compile
 if [ $# -eq 0 ]; then
         make
@@ -35 +30 @@
         make -j $1
 fi
+
+# Install
 make install