[issm-svn] r23436 - in issm/trunk: externalpackages/autotools scripts
jdquinn at issm.ess.uci.edu
jdquinn at issm.ess.uci.edu
Thu Oct 25 15:04:07 PDT 2018
Author: jdquinn
Date: 2018-10-25 15:04:07 -0700 (Thu, 25 Oct 2018)
New Revision: 23436
Added:
issm/trunk/scripts/DownloadExternalPackage.sh
Modified:
issm/trunk/externalpackages/autotools/install-win.sh
issm/trunk/externalpackages/autotools/install.sh
Log:
CHG: Added external package bash download script; modified autotools install scripts to use aforementioned script
Modified: issm/trunk/externalpackages/autotools/install-win.sh
===================================================================
--- issm/trunk/externalpackages/autotools/install-win.sh 2018-10-25 21:59:54 UTC (rev 23435)
+++ issm/trunk/externalpackages/autotools/install-win.sh 2018-10-25 22:04:07 UTC (rev 23436)
@@ -18,7 +18,7 @@
M4_TARBALL="${M4}.tar.gz"
# Clean up existing assets
-rm -rf install src
+rm -rf install
# Set up for installation
mkdir install
@@ -26,7 +26,8 @@
# Install m4
echo " === INSTALLING M4 =="
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${M4_TARBALL}" $M4_TARBALL
+rm -rf src
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${M4_TARBALL}" $M4_TARBALL
tar -zxvf $M4_TARBALL
rm -f $M4_TARBALL
mv $M4 src
@@ -39,7 +40,7 @@
# Install autoconf
echo " === INSTALLING AUTOCONF =="
rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${AUTOCONF_TARBALL}" $AUTOCONF_TARBALL
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${AUTOCONF_TARBALL}" $AUTOCONF_TARBALL
tar -zxvf $AUTOCONF_TARBALL
rm -f $AUTOCONF_TARBALL
mv $AUTOCONF src
@@ -52,7 +53,7 @@
# Install automake
echo " === INSTALLING AUTOMAKE =="
rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${AUTOMAKE_TARBALL}" $AUTOMAKE_TARBALL
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${AUTOMAKE_TARBALL}" $AUTOMAKE_TARBALL
tar -zxvf $AUTOMAKE_TARBALL
rm -f $AUTOMAKE_TARBALL
mv $AUTOMAKE src
@@ -65,7 +66,7 @@
# Install libtool
echo " === INSTALLING LIBTOOL =="
rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${LIBTOOL_TARBALL}" $LIBTOOL_TARBALL
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${LIBTOOL_TARBALL}" $LIBTOOL_TARBALL
tar -zxvf $LIBTOOL_TARBALL
rm -f $LIBTOOL_TARBALL
mv $LIBTOOL src
Modified: issm/trunk/externalpackages/autotools/install.sh
===================================================================
--- issm/trunk/externalpackages/autotools/install.sh 2018-10-25 21:59:54 UTC (rev 23435)
+++ issm/trunk/externalpackages/autotools/install.sh 2018-10-25 22:04:07 UTC (rev 23436)
@@ -1,17 +1,36 @@
#!/bin/bash
set -eu
+AUTOCONF_VER="2.69"
+AUTOMAKE_MIN_VER="1.16"
+AUTOMAKE_BUILD_VER="${AUTOMAKE_MIN_VER}.1"
+LIBTOOL_VER="2.4.2"
+M4_VER="1.4.17"
+
+AUTOCONF="autoconf-${AUTOCONF_VER}"
+AUTOMAKE="automake-${AUTOMAKE_BUILD_VER}"
+LIBTOOL="libtool-${LIBTOOL_VER}"
+M4="m4-${M4_VER}"
+
+AUTOCONF_TARBALL="${AUTOCONF}.tar.gz"
+AUTOMAKE_TARBALL="${AUTOMAKE}.tar.gz"
+LIBTOOL_TARBALL="${LIBTOOL}.tar.gz"
+M4_TARBALL="${M4}.tar.gz"
+
+# Clean up existing assets
rm -rf install
+
+# Set up for installation
mkdir install
-
export PATH="$ISSM_DIR/externalpackages/autotools/install/bin:$PATH"
-#install m4
+# Install m4
echo " === INSTALLING M4 =="
rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/m4-1.4.17.tar.gz' 'm4-1.4.17.tar.gz'
-tar -zxvf m4-1.4.17.tar.gz
-mv m4-1.4.17 src
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${M4_TARBALL}" $M4_TARBALL
+tar -zxvf $M4_TARBALL
+rm -f $M4_TARBALL
+mv $M4 src
cd src
./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
make
@@ -18,39 +37,41 @@
make install
cd ..
-#install autoconf
+# Install autoconf
echo " === INSTALLING AUTOCONF =="
rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/autoconf-2.69.tar.gz' 'autoconf-2.69.tar.gz'
-tar -zxvf autoconf-2.69.tar.gz
-mv autoconf-2.69 src
-cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${AUTOCONF_TARBALL}" $AUTOCONF_TARBALL
+tar -zxvf $AUTOCONF_TARBALL
+rm -f $AUTOCONF_TARBALL
+mv $AUTOCONF src
+cd src
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
+make
make install
cd ..
-#install automake
+# Install automake
echo " === INSTALLING AUTOMAKE =="
rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/automake-1.14.tar.gz' 'automake-1.14.tar.gz'
-tar -zxvf automake-1.14.tar.gz
-mv automake-1.14 src
-cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${AUTOMAKE_TARBALL}" $AUTOMAKE_TARBALL
+tar -zxvf $AUTOMAKE_TARBALL
+rm -f $AUTOMAKE_TARBALL
+mv $AUTOMAKE src
+cd src
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
+make
make install
cd ..
-#install libtool
+# Install libtool
echo " === INSTALLING LIBTOOL =="
rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libtool-2.4.2.tar.gz' 'libtool-2.4.2.tar.gz'
-tar -zxvf libtool-2.4.2.tar.gz
-rm libtool-2.4.2.tar.gz
-mv libtool-2.4.2 src
-cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${LIBTOOL_TARBALL}" $LIBTOOL_TARBALL
+tar -zxvf $LIBTOOL_TARBALL
+rm -f $LIBTOOL_TARBALL
+mv $LIBTOOL src
+cd src
+./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
+make
make install
cd ..
Added: issm/trunk/scripts/DownloadExternalPackage.sh
===================================================================
--- issm/trunk/scripts/DownloadExternalPackage.sh (rev 0)
+++ issm/trunk/scripts/DownloadExternalPackage.sh 2018-10-25 22:04:07 UTC (rev 23436)
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# DownloadExternalPackage.bash
+# Generally, used to download a hosted file from a URL
+# URL - Location of file to download
+# file - File to write to (including path)
+# usage: download_external_package.bash URL file
+
+## Constants
+#
+MSG_ERR_NO_GET_CMD="No supported file download command was found"
+MSG_USAGE="usage: $(basename ${0}) [-h] URL file
+ URL : Location of file to download
+ file : File to write to (including path)"
+
+## Variables
+#
+OUT_FILE=""
+URL=""
+
+## Check that number of args is 2 (note that this also handles case where user
+# explicitly requests help)
+#
+if [ $# != 2 ]
+then
+ echo "$MSG_USAGE"
+ exit 0
+fi
+
+## Retrieve args
+#
+URL=$1
+OUT_FILE=$2
+
+## Check if OUT_FILE already exists
+#
+if [ -f ${OUT_FILE} ]
+then
+ echo "File ${OUT_FILE} already exists and will not be downloaded..."
+ exit 0
+fi
+
+## Download file
+#
+if [ ! -z `which wget` ]
+then
+ wget --quiet -O $OUT_FILE $URL
+elif [ ! -z `which curl` ]
+then
+ curl --silent $URL -o $OUT_FILE
+else
+ echo $MSG_ERR_NO_GET_CMD
+ exit 0
+fi
+
+exit 0
Property changes on: issm/trunk/scripts/DownloadExternalPackage.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
More information about the issm-svn
mailing list