Index: sm/trunk-jpl/externalpackages/gdal/install-1.10-debian-netcdf.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-1.10-debian-netcdf.sh (revision 27566) +++ (revision ) @@ -1,49 +1,0 @@ -#!/bin/bash -set -eu - - -# Constants -# -VER="1.10.0" -HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install" -NETCDF_ROOT="${ISSM_DIR}/externalpackages/petsc/install" -PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" - -# Cleanup -rm -rf install src -mkdir install src - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" - -# Unpack source -tar -zxvf gdal-${VER}.tar.gz - -# Move source into 'src' directory -mv gdal-${VER}/* src -rm -rf gdal-${VER} - -# Copy customized source files to 'src' directory -cp configs/1.10/linux/debian/frmts/wms/dataset.cpp src/frmts/wms -cp configs/1.10/linux/debian/ogr/ogrsf_frmts/vfk/vfkfeature.cpp src/ogr/ogrsf_frmts/vfk -cp configs/1.10/linux/debian/port/cplkeywordparser.cpp src/port - -# Configure -cd src -./configure \ - --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ - --with-hdf5="${HDF5_ROOT}" \ - --with-netcdf="${NETCDF_ROOT}" \ - --with-proj="${PROJ_ROOT}" - -# Compile and install -if [ $# -eq 0 ]; then - make - make install -else - make -j $1 - make -j $1 install -fi - -# Return to initial directory -cd .. Index: sm/trunk-jpl/externalpackages/gdal/install-1.10-linux64-nopython.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-1.10-linux64-nopython.sh (revision 27566) +++ (revision ) @@ -1,45 +1,0 @@ -#!/bin/bash -set -eu - -#WARNING: you need to have python installed in externalpackages - -#Some cleanup -rm -rf src -rm -rf install -rm -rf gdal-1.10.0 -mkdir src install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gdal-1.10.0.tar.gz' 'gdal-1.10.0.tar.gz' - -#Untar -tar -zxvf gdal-1.10.0.tar.gz - -#Move gdal into src directory -mv gdal-1.10.0/* src -rm -rf gdal-1.10.0 - -export CFLAGS=-D_HAVE_STRNDUP -export CXXFLAGS=-D_HAVE_STRNDUP - -#Configure gdal -cd src -./configure \ - --prefix="$ISSM_DIR/externalpackages/gdal/install" \ - --with-python=no \ - --with-netcdf=no \ - --with-jasper=no \ - --without-hdf5 - -#Compile and install gdal -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install - -#For some reasons, on thwaites, one needs to do the following to get the python bindings: -#cd src/swig/python/ -# python setup.py build -# python setup.py install Index: sm/trunk-jpl/externalpackages/gdal/install-1.10-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-1.10-linux64.sh (revision 27566) +++ (revision ) @@ -1,45 +1,0 @@ -#!/bin/bash -set -eu - -#WARNING: you need to have python installed in externalpackages - -#Some cleanup -rm -rf src -rm -rf install -rm -rf gdal-1.10.0 -mkdir src install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gdal-1.10.0.tar.gz' 'gdal-1.10.0.tar.gz' - -#Untar -tar -zxvf gdal-1.10.0.tar.gz - -#Move gdal into src directory -mv gdal-1.10.0/* src -rm -rf gdal-1.10.0 - -export CFLAGS=-D_HAVE_STRNDUP -export CXXFLAGS=-D_HAVE_STRNDUP - -#Configure gdal -cd src -./configure \ - --prefix="$ISSM_DIR/externalpackages/gdal/install" \ - --with-python=yes \ - --with-netcdf=no \ - --with-jasper=no \ - --without-hdf5 - -#Compile and install gdal -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install - -#For some reasons, on thwaites, one needs to do the following to get the python bindings: -#cd src/swig/python/ -# python setup.py build -# python setup.py install Index: sm/trunk-jpl/externalpackages/gdal/install-1.10-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-1.10-macosx64.sh (revision 27566) +++ (revision ) @@ -1,40 +1,0 @@ -#!/bin/bash -set -eu - -GDAL_VER="1.10.0" - -# Some cleanup -rm -rf src -rm -rf install -rm -rf gdal-${GDAL_VER} -mkdir src install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${GDAL_VER}.tar.gz" "gdal-${GDAL_VER}.tar.gz" - -# Untar -tar -zxvf gdal-${GDAL_VER}.tar.gz - -# Move gdal into src directory -mv gdal-${GDAL_VER}/* src -rm -rf gdal-${GDAL_VER} - -# Configure gdal -cd src -./configure \ - --prefix="$ISSM_DIR/externalpackages/gdal/install" \ - --with-python \ - --with-netcdf=no \ - --with-libiconv-prefix="/usr/lib/" \ - --without-hdf5 \ - --with-expat=$ISSM_DIR/externalpackages/expat/install -#Note: -# look for libiconv in /usr/lib/ because there seemed to be a conflict with port's library - -#Compile and install gdal -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install Index: sm/trunk-jpl/externalpackages/gdal/install-1.11.2-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-1.11.2-macosx64.sh (revision 27566) +++ (revision ) @@ -1,38 +1,0 @@ -#!/bin/bash -set -eu - -GDAL_VER="1.11.2" - -# Some cleanup -rm -rf src -rm -rf install -rm -rf gdal-${GDAL_VER} -mkdir src install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${GDAL_VER}.tar.gz" "gdal-${GDAL_VER}.tar.gz" - -# Untar -tar -zxvf gdal-${GDAL_VER}.tar.gz - -# Move gdal into src directory -mv gdal-${GDAL_VER}/* src -rm -rf gdal-${GDAL_VER} - -# Configure gdal -# NOTE: Look for libiconv in /usr/lib/ because there seemed to be a conflict with port's library -cd src -./configure \ - --prefix="$ISSM_DIR/externalpackages/gdal/install" \ - --with-python \ - --with-netcdf=no \ - --with-libiconv-prefix="/usr/lib/" \ - --without-hdf5 - -#Compile and install gdal -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install Index: /issm/trunk-jpl/externalpackages/gdal/install-3-python-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3-python-static.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/gdal/install-3-python-static.sh (revision 27567) @@ -16,6 +16,5 @@ export CXXFLAGS="-std=c++11" export CXX=mpicxx -export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time -export LIBS="-lsqlite3 -lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time +export LIBS="-lsqlite3 -lhdf5_hl -lhdf5" export PREFIX="${ISSM_DIR}/externalpackages/gdal/install" # Need this to properly set destination root for Python libraries on macOS (should not affect Linux build; do not need for this configuration, but including it for consistency) @@ -45,5 +44,4 @@ --with-python="python3" \ --with-curl="${CURL_ROOT}/bin/curl-config" \ - --with-hdf5="${HDF5_ROOT}" \ --with-jpeg=internal \ --with-libz="${ZLIB_ROOT}" \ Index: /issm/trunk-jpl/externalpackages/gdal/install-3-python.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3-python.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/gdal/install-3-python.sh (revision 27567) @@ -35,5 +35,4 @@ --enable-fast-install \ --with-python="python3" \ - --with-hdf5="${HDF5_ROOT}" \ --with-libz="${ZLIB_ROOT}" \ --with-netcdf="${NETCDF_ROOT}" \ Index: /issm/trunk-jpl/externalpackages/gdal/install-3-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3-static.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/gdal/install-3-static.sh (revision 27567) @@ -16,6 +16,5 @@ export CXXFLAGS="-std=c++11" export CXX=mpicxx -export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time -export LIBS="-lsqlite3 -lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time +export LIBS="-lsqlite3 -lhdf5_hl -lhdf5" export PREFIX="${ISSM_DIR}/externalpackages/gdal/install" # NOTE: Need to export this to properly set destination root for Python libraries on macOS (should not affect Linux build). Set to location where external package should be installed. @@ -44,5 +43,4 @@ --with-pic \ --with-curl="${CURL_ROOT}/bin/curl-config" \ - --with-hdf5="${HDF5_ROOT}" \ --with-jpeg=internal \ --with-libz="${ZLIB_ROOT}" \ Index: /issm/trunk-jpl/externalpackages/gdal/install-3.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/gdal/install-3.sh (revision 27567) @@ -30,5 +30,4 @@ --prefix="${PREFIX}" \ --enable-fast-install \ - --with-hdf5="${HDF5_ROOT}" \ --with-libz="${ZLIB_ROOT}" \ --with-netcdf="${NETCDF_ROOT}" \ Index: /issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake =================================================================== --- /issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake (revision 27566) +++ /issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake (revision 27567) @@ -150,6 +150,4 @@ ${NETCDF_ROOT} $ENV{NETCDF_ROOT} - ${HDF5_ROOT} - $ENV{HDF5_ROOT} ${ZLIB_ROOT} $ENV{ZLIB_ROOT} Index: /issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake =================================================================== --- /issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake (revision 27566) +++ /issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake (revision 27567) @@ -115,6 +115,4 @@ NAMES ${_extralib} HINTS - ${HDF5_ROOT} - $ENV{HDF5_ROOT} ${ZLIB_ROOT} $ENV{ZLIB_ROOT} Index: /issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh (revision 27567) @@ -67,5 +67,4 @@ -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \ -DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \ - -DHDF5_ROOT="${HDF5_ROOT}" \ -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \ -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \ Index: /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh (revision 27567) @@ -67,5 +67,4 @@ -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \ -DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \ - -DHDF5_ROOT="${HDF5_ROOT}" \ -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \ -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \ Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static-with_tests.sh =================================================================== --- /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static-with_tests.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static-with_tests.sh (revision 27567) @@ -32,5 +32,4 @@ export CPPFLAGS="-I${ZLIB_ROOT}/include" -export HDF5LIB="${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a" export ZLIB="${ZLIB_ROOT}/lib/libz.a" Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static.sh (revision 27567) @@ -32,5 +32,4 @@ export CPPFLAGS="-I${ZLIB_ROOT}/include" -export HDF5LIB="${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a" export ZLIB="${ZLIB_ROOT}/lib/libz.a" Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh =================================================================== --- /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh (revision 27567) @@ -22,6 +22,6 @@ # export CC=mpicc -export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include" -export LDFLAGS="-L${CURL_ROOT}/lib -L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib" +export CPPFLAGS="-I${CURL_ROOT}/include -I${ZLIB_ROOT}/include" +export LDFLAGS="-L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib" # Download source Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh =================================================================== --- /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh (revision 27567) @@ -22,6 +22,6 @@ # export CC=mpicc -export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include" -export LDFLAGS="-L${CURL_ROOT}/lib -L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib" +export CPPFLAGS="-I${CURL_ROOT}/include -I${ZLIB_ROOT}/include" +export LDFLAGS="-L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib" # Download source Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh =================================================================== --- /issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh (revision 27567) @@ -21,6 +21,6 @@ # Environment # -export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include" -export LDFLAGS="-L${CURL_ROOT}/lib -L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib" +export CPPFLAGS="-I${CURL_ROOT}/include -I${ZLIB_ROOT}/include" +export LDFLAGS="-L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib" # Download source Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7.sh =================================================================== --- /issm/trunk-jpl/externalpackages/netcdf/install-4.7.sh (revision 27566) +++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7.sh (revision 27567) @@ -21,6 +21,6 @@ # Environment # -export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include" -export LDFLAGS="-L${CURL_ROOT}/lib -L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib" +export CPPFLAGS="-I${CURL_ROOT}/include -I${ZLIB_ROOT}/include" +export LDFLAGS="-L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib" # Download source Index: /issm/trunk-jpl/jenkins/linux64_caladan =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan (revision 27566) +++ /issm/trunk-jpl/jenkins/linux64_caladan (revision 27567) @@ -39,5 +39,5 @@ #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES="autotools install.sh cmake install.sh Index: /issm/trunk-jpl/jenkins/linux64_caladan_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan_ad (revision 27566) +++ /issm/trunk-jpl/jenkins/linux64_caladan_ad (revision 27567) @@ -29,5 +29,5 @@ #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-linux.sh Index: /issm/trunk-jpl/jenkins/linux64_caladan_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan_ampi (revision 27566) +++ /issm/trunk-jpl/jenkins/linux64_caladan_ampi (revision 27567) @@ -39,5 +39,5 @@ #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-linux.sh Index: /issm/trunk-jpl/jenkins/mac-intel-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-basic (revision 27566) +++ /issm/trunk-jpl/jenkins/mac-intel-basic (revision 27567) @@ -31,5 +31,5 @@ #-------------------# -# List of external pakages to be installed and their installation scripts +# List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/mac-intel-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 27566) +++ /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 27567) @@ -43,5 +43,5 @@ #-------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/mac-intel-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 27566) +++ /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 27567) @@ -43,5 +43,5 @@ #-------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/mac-silicon-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 27566) +++ /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 27567) @@ -40,5 +40,5 @@ #-------------------# -# List of external pakages to be installed and their installation scripts +# List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/pine_island-mac-basic =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-basic (revision 27566) +++ /issm/trunk-jpl/jenkins/pine_island-mac-basic (revision 27567) @@ -31,5 +31,5 @@ #-------------------# -# List of external pakages to be installed and their installation scripts +# List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/pine_island-mac-dakota =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-dakota (revision 27566) +++ /issm/trunk-jpl/jenkins/pine_island-mac-dakota (revision 27567) @@ -42,5 +42,5 @@ #-------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth (revision 27566) +++ /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth (revision 27567) @@ -42,5 +42,5 @@ #-------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth-lambert =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth-lambert (revision 27566) +++ /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth-lambert (revision 27567) @@ -42,5 +42,5 @@ #-------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic =================================================================== --- /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic (revision 27566) +++ /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic (revision 27567) @@ -23,5 +23,5 @@ #-------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" metis install-5-win-msys2-gcc.sh Index: /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic =================================================================== --- /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic (revision 27566) +++ /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic (revision 27567) @@ -28,5 +28,5 @@ #-------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" msmpi install.sh Index: /issm/trunk-jpl/jenkins/windows =================================================================== --- /issm/trunk-jpl/jenkins/windows (revision 27566) +++ /issm/trunk-jpl/jenkins/windows (revision 27567) @@ -37,5 +37,5 @@ #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-win.sh Index: /issm/trunk-jpl/jenkins/windows-par =================================================================== --- /issm/trunk-jpl/jenkins/windows-par (revision 27566) +++ /issm/trunk-jpl/jenkins/windows-par (revision 27567) @@ -35,5 +35,5 @@ #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES="autotools install-win.sh petsc install-dev-win10-par.sh Index: /issm/trunk-jpl/jenkins/windows_static =================================================================== --- /issm/trunk-jpl/jenkins/windows_static (revision 27566) +++ /issm/trunk-jpl/jenkins/windows_static (revision 27567) @@ -37,5 +37,5 @@ #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES="autotools install-win.sh petsc install-3.6-win10.sh