Changeset 28197


Ignore:
Timestamp:
04/03/24 11:07:25 (12 months ago)
Author:
jdquinn
Message:

CHG: External package upgrades; fixes for distributables; cleanup

Location:
issm/trunk-jpl
Files:
5 added
12 deleted
54 edited
4 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/etc/environment.sh

    r28161 r28197  
    300300MPI_ROOT_TEMP="${ISSM_EXT_DIR}/mpich/install"
    301301if [ -d "${MPI_ROOT_TEMP}" ]; then
     302        export MPI_ROOT=${MPI_ROOT_TEMP}
    302303        export MPI_DIR=${MPI_ROOT_TEMP}
    303304        export MPI_HOME=${MPI_ROOT_TEMP} # Used in installation of Dakota
    … …  
    441442        # MPICH
    442443        if [ -f "${PETSC_ROOT}/bin/mpiexec" ]; then
    443                 MPI_ROOT=${PETSC_ROOT}
     444                export MPI_ROOT=${PETSC_ROOT}
    444445                export MPI_DIR=${MPI_ROOT}
    445446                export MPI_HOME=${MPI_ROOT} # Used in installation of Dakota

  • issm/trunk-jpl/externalpackages/curl/install-7-linux-static.sh

    r27153 r28197  
    3838        --without-nghttp2 \
    3939        --without-brotli \
    40         --without-librtmp
     40        --without-librtmp \
     41        --without-ssl
    4142
    4243# Compile and install

  • issm/trunk-jpl/externalpackages/curl/install-7-linux.sh

    r25868 r28197  
    3131        --disable-manual \
    3232        --disable-verbose \
    33         --with-zlib="${ZLIB_ROOT}"
     33        --with-zlib="${ZLIB_ROOT}" \
     34        --without-ssl
    3435
    3536# Compile and install

  • issm/trunk-jpl/externalpackages/curl/install-7-mac-static.sh

    r27153 r28197  
    4343        --without-brotli \
    4444        --without-librtmp \
    45         --with-secure-transport
     45        --without-ssl
    4646
    4747# Compile and install

  • issm/trunk-jpl/externalpackages/curl/install-7-mac.sh

    r25868 r28197  
    3636        --disable-verbose \
    3737        --with-zlib="${ZLIB_ROOT}" \
    38         --with-secure-transport
     38        --without-ssl
    3939
    4040# Compile and install

  • issm/trunk-jpl/externalpackages/gdal/install-3-python-static.sh

    r27699 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    99## Constants
    1010#
    11 VER="3.5.3"
     11VER="3.8.4"
     12
     13PREFIX="${ISSM_DIR}/externalpackages/gdal/install"
    1214
    1315## Environment
    1416#
    15 export CC=mpicc
    16 export CXXFLAGS="-std=c++11"
    17 export CXX=mpicxx
    18 export LIBS="-lsqlite3 -lhdf5_hl -lhdf5"
    19 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)
     17export CFLAGS="${CFLAGS} -w"
     18export CXXFLAGS="${CXXFLAGS} -w"
    2019
    2120# Cleanup
    … …  
    2423
    2524# Download source
    26 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
     25${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
    2726
    2827# Unpack source
    … …  
    3534# Configure
    3635cd src
    37 ./configure \
    38         --prefix="${PREFIX}" \
    39         --enable-fast-install \
    40         --disable-shared \
    41         --without-ld-shared \
    42         --enable-static \
    43         --with-pic \
    44         --with-python="python3" \
    45         --with-curl="${CURL_ROOT}/bin/curl-config" \
    46         --with-hdf5="${HDF5_ROOT}" \
    47         --with-jpeg=internal \
    48         --with-libz="${ZLIB_ROOT}" \
    49         --with-netcdf="${NETCDF_ROOT}" \
    50         --with-pcre=no \
    51         --with-pg=no \
    52         --with-png=internal \
    53         --with-proj="${PROJ_ROOT}" \
    54         --with-zstd=no
     36cmake \
     37        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
     38        -DCMAKE_BUILD_TYPE=Release \
     39        -DCMAKE_C_COMPILER=mpicc \
     40        -DCMAKE_CXX_COMPILER=mpicxx \
     41        -DBUILD_SHARED_LIBS=OFF \
     42        -DBUILD_PYTHON_BINDINGS=ON \
     43        -DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
     44        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
     45        -DCURL_LIBRARY_RELEASE="${CURL_ROOT}/lib/libcurl.a" \
     46        -DCURL_USE_STATIC_LIBS=ON \
     47        -DGDAL_USE_JPEG_INTERNAL=ON \
     48        -DGDAL_USE_JPEG12_INTERNAL=ON \
     49        -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
     50        -DNETCDF_LIBRARY="${NETCDF_ROOT}/lib/libnetcdf.a" \
     51        -DGDAL_USE_OPENJPEG=OFF \
     52        -DGDAL_USE_OPENSSL=OFF \
     53        -DGDAL_USE_PNG_INTERNAL=ON \
     54        -DPROJ_INCLUDE_DIR="${PROJ_ROOT}/include" \
     55        -DPROJ_LIBRARY_RELEASE="${PROJ_ROOT}/lib/libproj.a" \
     56        -DGDAL_USE_TIFF_INTERNAL=ON \
     57        -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
     58        -DZLIB_LIBRARY_RELEASE="${ZLIB_ROOT}/lib/libz.a" \
     59        -DZLIB_IS_STATIC=ON \
     60        -DGDAL_USE_ZSTD=OFF
    5561
    5662# Compile and install

  • issm/trunk-jpl/externalpackages/gdal/install-3-python.sh

    r27699 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    99## Constants
    1010#
    11 VER="3.5.3"
     11VER="3.8.4"
     12
     13PREFIX="${ISSM_DIR}/externalpackages/gdal/install"
    1214
    1315## Environment
    1416#
    15 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.
     17export CFLAGS="${CFLAGS} -w"
     18export CXXFLAGS="${CXXFLAGS} -w"
    1619
    1720# Cleanup
    … …  
    2023
    2124# Download source
    22 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
     25${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
    2326
    2427# Unpack source
    … …  
    3134# Configure
    3235cd src
    33 ./configure \
    34         --prefix="${PREFIX}" \
    35         --enable-fast-install \
    36         --with-python="python3" \
    37         --with-curl="${CURL_ROOT}/bin/curl-config" \
    38         --with-hdf5="${HDF5_ROOT}" \
    39         --with-libz="${ZLIB_ROOT}" \
    40         --with-netcdf="${NETCDF_ROOT}" \
    41         --with-proj="${PROJ_ROOT}"
     36cmake \
     37        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
     38        -DCMAKE_BUILD_TYPE=Release \
     39        -DCMAKE_C_COMPILER=mpicc \
     40        -DCMAKE_CXX_COMPILER=mpicxx \
     41        -DBUILD_SHARED_LIBS=ON \
     42        -DBUILD_PYTHON_BINDINGS=ON \
     43        -DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
     44        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
     45        -DCURL_LIBRARY_RELEASE="-L${CURL_ROOT}/lib -lcurl" \
     46        -DGDAL_USE_JPEG_INTERNAL=ON \
     47        -DGDAL_USE_JPEG12_INTERNAL=ON \
     48        -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
     49        -DNETCDF_LIBRARY="-L${NETCDF_ROOT}/lib -lnetcdf" \
     50        -DGDAL_USE_OPENJPEG=OFF \
     51        -DGDAL_USE_OPENSSL=OFF \
     52        -DGDAL_USE_PNG_INTERNAL=ON \
     53        -DPROJ_INCLUDE_DIR="${PROJ_ROOT}/include" \
     54        -DPROJ_LIBRARY_RELEASE="-L${PROJ_ROOT}/lib -lproj" \
     55        -DGDAL_USE_TIFF_INTERNAL=ON \
     56        -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
     57        -DZLIB_LIBRARY_RELEASE="-L${ZLIB_ROOT}/lib -lz" \
     58        -DGDAL_USE_ZSTD=OFF
    4259
    4360# Compile and install

  • issm/trunk-jpl/externalpackages/gdal/install-3-static.sh

    r27699 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    99## Constants
    1010#
    11 VER="3.5.3"
     11VER="3.8.4"
     12
     13PREFIX="${ISSM_DIR}/externalpackages/gdal/install"
    1214
    1315## Environment
    1416#
    15 export CC=mpicc
    16 export CXXFLAGS="-std=c++11"
    17 export CXX=mpicxx
    18 export LIBS="-lsqlite3 -lhdf5_hl -lhdf5"
    19 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.
     17export CFLAGS="${CFLAGS} -w"
     18export CXXFLAGS="${CXXFLAGS} -w"
    2019
    2120# Cleanup
    … …  
    2423
    2524# Download source
    26 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
     25${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
    2726
    2827# Unpack source
    … …  
    3534# Configure
    3635cd src
    37 ./configure \
    38         --prefix="${PREFIX}" \
    39         --enable-fast-install \
    40         --disable-shared \
    41         --without-ld-shared \
    42         --enable-static \
    43         --with-pic \
    44         --with-curl="${CURL_ROOT}/bin/curl-config" \
    45         --with-hdf5="${HDF5_ROOT}" \
    46         --with-jpeg=internal \
    47         --with-libz="${ZLIB_ROOT}" \
    48         --with-netcdf="${NETCDF_ROOT}" \
    49         --with-pcre=no \
    50         --with-pg=no \
    51         --with-png=internal \
    52         --with-proj="${PROJ_ROOT}" \
    53         --with-zstd=no
     36cmake \
     37        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
     38        -DCMAKE_BUILD_TYPE=Release \
     39        -DCMAKE_C_COMPILER=mpicc \
     40        -DCMAKE_CXX_COMPILER=mpicxx \
     41        -DBUILD_SHARED_LIBS=OFF \
     42        -DBUILD_PYTHON_BINDINGS=OFF \
     43        -DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
     44        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
     45        -DCURL_LIBRARY_RELEASE="${CURL_ROOT}/lib/libcurl.a" \
     46        -DCURL_USE_STATIC_LIBS=ON \
     47        -DGDAL_USE_JPEG_INTERNAL=ON \
     48        -DGDAL_USE_JPEG12_INTERNAL=ON \
     49        -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
     50        -DNETCDF_LIBRARY="${NETCDF_ROOT}/lib/libnetcdf.a" \
     51        -DGDAL_USE_OPENJPEG=OFF \
     52        -DGDAL_USE_OPENSSL=OFF \
     53        -DGDAL_USE_PNG_INTERNAL=ON \
     54        -DPROJ_INCLUDE_DIR="${PROJ_ROOT}/include" \
     55        -DPROJ_LIBRARY_RELEASE="${PROJ_ROOT}/lib/libproj.a" \
     56        -DGDAL_USE_TIFF_INTERNAL=ON \
     57        -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
     58        -DZLIB_LIBRARY_RELEASE="${ZLIB_ROOT}/lib/libz.a" \
     59        -DZLIB_IS_STATIC=ON \
     60        -DGDAL_USE_ZSTD=OFF
    5461
    5562# Compile and install

  • issm/trunk-jpl/externalpackages/gdal/install-3.sh

    r27567 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
     4
     5## TODO
     6#       - May want to supply path to Python instead of, effectively, using result of `which python`
     7#
    48
    59## Constants
    610#
    7 VER="3.5.3"
     11VER="3.8.4"
     12
     13PREFIX="${ISSM_DIR}/externalpackages/gdal/install"
    814
    915## Environment
    1016#
    11 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.
     17export CFLAGS="${CFLAGS} -w"
     18export CXXFLAGS="${CXXFLAGS} -w"
    1219
    1320# Cleanup
    … …  
    1623
    1724# Download source
    18 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
     25${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
    1926
    2027# Unpack source
    … …  
    2734# Configure
    2835cd src
    29 ./configure \
    30         --prefix="${PREFIX}" \
    31         --enable-fast-install \
    32         --with-libz="${ZLIB_ROOT}" \
    33         --with-netcdf="${NETCDF_ROOT}" \
    34         --with-proj="${PROJ_ROOT}"
     36cmake \
     37        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
     38        -DCMAKE_BUILD_TYPE=Release \
     39        -DCMAKE_C_COMPILER=mpicc \
     40        -DCMAKE_CXX_COMPILER=mpicxx \
     41        -DBUILD_SHARED_LIBS=ON \
     42        -DBUILD_PYTHON_BINDINGS=OFF \
     43        -DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
     44        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
     45        -DCURL_LIBRARY_RELEASE="-L${CURL_ROOT}/lib -lcurl" \
     46        -DGDAL_USE_JPEG_INTERNAL=ON \
     47        -DGDAL_USE_JPEG12_INTERNAL=ON \
     48        -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
     49        -DNETCDF_LIBRARY="-L${NETCDF_ROOT}/lib -lnetcdf" \
     50        -DGDAL_USE_OPENJPEG=OFF \
     51        -DGDAL_USE_OPENSSL=OFF \
     52        -DGDAL_USE_PNG_INTERNAL=ON \
     53        -DPROJ_INCLUDE_DIR="${PROJ_ROOT}/include" \
     54        -DPROJ_LIBRARY_RELEASE="-L${PROJ_ROOT}/lib -lproj" \
     55        -DGDAL_USE_TIFF_INTERNAL=ON \
     56        -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
     57        -DZLIB_LIBRARY_RELEASE="-L${ZLIB_ROOT}/lib -lz" \
     58        -DGDAL_USE_ZSTD=OFF
    3559
    3660# Compile and install

  • issm/trunk-jpl/externalpackages/gmsh/install-4-linux-static.sh

    r28133 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    2525#
    2626echo "Finding libgfortran..."
    27 LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
     27LIBGFORTRAN=$(find /usr -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
    2828LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    29 LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
     29LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc.* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
     30
     31# Environment
     32#
     33export CXXFLAGS="${CXXFLAGS} -w"
    3034
    3135# Cleanup

  • issm/trunk-jpl/externalpackages/gmsh/install-4-linux.sh

    r28133 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    2525#
    2626echo "Finding libgfortran..."
    27 LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
     27LIBGFORTRAN=$(find /usr -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
    2828LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
     29
     30# Environment
     31#
     32export CXXFLAGS="${CXXFLAGS} -w"
    2933
    3034# Cleanup

  • issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh

    r28133 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    2727#
    2828echo "Finding libgfortran..."
    29 LIBGFORTRAN=$(find /usr /opt -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     29LIBGFORTRAN=$(find /usr /opt -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    3030LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    31 LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     31LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc.* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     32
     33# Environment
     34#
     35export CXXFLAGS="${CXXFLAGS} -w"
    3236
    3337# Cleanup

  • issm/trunk-jpl/externalpackages/gmsh/install-4-mac.sh

    r28133 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    2525#
    2626echo "Finding libgfortran..."
    27 LIBGFORTRAN=$(find /usr /opt -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     27LIBGFORTRAN=$(find /usr /opt -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    2828LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
     29
     30# Environment
     31#
     32export CXXFLAGS="${CXXFLAGS} -w"
    2933
    3034# Cleanup

  • issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/cmake/modules/FindGDAL.cmake.patch

    r28165 r28197  
    1 --- src/cmake/modules/FindGDAL.cmake    2024-03-20 19:47:15
    2 +++ FindGDAL.cmake      2024-03-20 19:55:54
     1--- src/cmake/modules/FindGDAL.cmake    2024-01-07 01:32:40
     2+++ FindGDAL.cmake      2024-03-31 19:36:43
    33@@ -81,12 +81,25 @@
    44                        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
    … …  
    3131 
    3232 find_path (GDAL_INCLUDE_DIR gdal.h
    33 @@ -129,6 +142,46 @@
     33@@ -129,6 +142,57 @@
    3434        /usr/local
    3535 )
    … …  
    7373+               list (APPEND GDAL_LIBRARY ${_found_lib_${_extralib}})
    7474+       endforeach (_extralib)
     75+       # Retrieve static library names
     76+       string(REGEX MATCHALL "[-_/a-zA-Z0-9]+\\.a" _gdal_extra_static_lib "${GDAL_EXTRA_LIBS}")
     77+       foreach (_extralib ${_gdal_extra_static_lib})
     78+               find_library (${_extralib}
     79+                       NAMES ${_extralib}
     80+                       PATH_SUFFIXES lib
     81+                       PATHS
     82+                       ${_gdal_extra_libpath}
     83+               )
     84+               list (APPEND GDAL_LIBRARY ${_extralib})
     85+       endforeach (_extralib)
    7586+endif (GDAL_EXTRA_LIBS)
    7687+
    7788 include (FindPackageHandleStandardArgs)
    7889 find_package_handle_standard_args (GDAL DEFAULT_MSG GDAL_LIBRARY GDAL_INCLUDE_DIR)
     90 

  • issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/cmake/modules/FindNETCDF.cmake.patch

    r28161 r28197  
    1 --- src/cmake/modules/FindNETCDF.cmake  2024-01-07 01:32:40
    2 +++ FindNETCDF.cmake     2024-03-20 19:01:13
     1--- src/cmake/modules/FindNETCDF.cmake  2024-01-07 01:32:40
     2+++ FindNETCDF.cmake    2024-03-31 15:12:47
    33@@ -67,6 +67,23 @@
    44                     OUTPUT_VARIABLE NETCDF_PREFIX_DIR
    … …  
    6565+    endforeach (_extralib)
    6666+    # Retrieve static library names
    67 +    string(REGEX MATCHALL "[a-zA-Z0-9]+\\.a" _netcdf_extra_static_lib "${NETCDF_EXTRA_LIBS}")
     67+    string(REGEX MATCHALL "[-_/a-zA-Z0-9]+\\.a" _netcdf_extra_static_lib "${NETCDF_EXTRA_LIBS}")
    6868+    foreach (_extralib ${_netcdf_extra_static_lib})
    69 +        find_library (_found_lib_${_extralib}
     69+        find_library (${_extralib}
    7070+            NAMES ${_extralib}
    7171+            PATH_SUFFIXES lib
    … …  
    7373+            ${_netcdf_extra_libpath}
    7474+        )
    75 +        list (APPEND NETCDF_LIBRARY ${_found_lib_${_extralib}})
     75+        list (APPEND NETCDF_LIBRARY ${_extralib})
    7676+    endforeach (_extralib)
    7777+endif (NETCDF_EXTRA_LIBS)

  • issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh

    r28190 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    99PREFIX="${ISSM_DIR}/externalpackages/gmt/install"
    1010
    11 # Find libgfortran and libgcc so we do not have to hardcode them
     11# Find certain libraries so we do not have to hardcode them
    1212#
    1313# TODO:
    … …  
    1717#
    1818echo "Finding libgfortran..."
    19 LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
     19LIBGFORTRAN=$(find /usr -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
    2020LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    21 LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
    2221
    23 GDAL_EXTRA_LIBS="-lstdc++" # Determined by running `$GDAL_ROOT/bin/gdal-config --dep-libs` then removing duplicate libs; for some reason, needed to run `sudo ln -s /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/libstdc++.so` after recent upgrades to make it so libstc++ is found
    24 NETCDF_EXTRA_LIBS="-lm -ldl -lz" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/6.0/static/cmake/modules/FindNETCDF.cmake)
     22GDAL_EXTRA_LIBS="-lm ${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a ${ZLIB_ROOT}/lib/libz.a -ldl -lsqlite3 ${PROJ_ROOT}/lib/libproj.a ${MPI_ROOT}/lib/libmpicxx.a -lstdc++" # See also patch for configuration file ./configs/${VER%.*}/static/cmake/modules/FindGDAL.cmake; for some reason, needed to run `sudo ln -s /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/libstdc++.so` after recent upgrades to make it so libstc++ is found
     23NETCDF_EXTRA_LIBS="${CURL_ROOT}/lib/libcurl.a ${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a ${ZLIB_ROOT}/lib/libz.a" # See also patch for configuration file ./configs/${VER%.*}/static/cmake/modules/FindNETCDF.cmake)
    2524
    2625# Environment
    2726#
    2827export CC=mpicc
     28export CFLAGS="${CFLAGS} -w"
    2929export CURL_INCLUDE_DIRS="${CURL_ROOT}/include"
    30 export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;/usr/lib/x86_64-linux-gnu/libssl.a;/usr/lib/x86_64-linux-gnu/libcrypto.a"
     30export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;${ZLIB_ROOT}/lib/libz.a"
    3131
    3232# Download source

  • issm/trunk-jpl/externalpackages/gmt/install-6-linux.sh

    r28178 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    99PREFIX="${ISSM_DIR}/externalpackages/gmt/install"
    1010
    11 # Find libgfortran so that we do not have to hardcode it.
     11# Find certain libraries so we do not have to hardcode them
    1212#
    1313# TODO:
    … …  
    1515#
    1616echo "Finding libgfortran..."
    17 LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
     17LIBGFORTRAN=$(find /usr -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
    1818LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    1919
    … …  
    2121#
    2222export CC=mpicc
     23export CFLAGS="${CFLAGS} -w"
    2324
    2425# Download source

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh

    r28178 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44# NOTE: After GMT version 6.0.0, we must build a shared copy of libgmt for our
    … …  
    2626#
    2727echo "Finding libgfortran..."
    28 LIBGFORTRAN=$(find /usr /opt -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     28LIBGFORTRAN=$(find /usr /opt -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    2929LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    30 LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    31 echo "Finding libssl..."
    32 LIBSSL=$(find /usr /opt -name libssl* 2>/dev/null | egrep -n libssl.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     30echo "Finding libglib..."
     31LIBGLIB=$(find /usr /opt -name libglib-2.0.* 2>/dev/null | egrep -n libglib-2.0.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     32LIBGLIB_ROOT=${LIBGLIB%/*}
     33echo "Finding libintl..."
     34LIBINTL=$(find /usr /opt -name libintl.* 2>/dev/null | egrep -n libintl.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     35echo "Finding libpcre..."
     36LIBPCRE=$(find /usr /opt -name libpcre2-8* 2>/dev/null | egrep -n libpcre2-8.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    3337
    34 GDAL_EXTRA_LIBS="-lc++" # `$GDAL_ROOT/bin/gdal-config --dep-libs` does not report need to link to libc++ (see also customized configuration file ./configs/6/static/cmake/modules/FindGDAL.cmake)
    35 NETCDF_EXTRA_LIBS="-lpthread -ldl -liconv" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/${VER%.*}/static/cmake/modules/FindNETCDF.cmake)
     38GDAL_EXTRA_LIBS="-lm ${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a ${ZLIB_ROOT}/lib/libz.a -ldl -lsqlite3 ${PROJ_ROOT}/lib/libproj.a ${MPI_ROOT}/lib/libmpicxx.a -lc++" # See also patch for configuration file ./configs/${VER%.*}/static/cmake/modules/FindGDAL.cmake
     39NETCDF_EXTRA_LIBS="${CURL_ROOT}/lib/libcurl.a ${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a ${ZLIB_ROOT}/lib/libz.a" # See also patch for configuration file ./configs/${VER%.*}/static/cmake/modules/FindNETCDF.cmake)
    3640
    3741# Environment
    3842#
    3943export CC=mpicc
     44export CFLAGS="${CFLAGS} -w"
    4045export CURL_INCLUDE_DIRS="${CURL_ROOT}/include"
    4146export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;${ZLIB_ROOT}/lib/libz.a"
    42 export LDFLAGS="-lsqlite3 -framework CoreFoundation -framework Security"
    4347
    4448# Download source
    … …  
    6266patch ./src/cmake/ConfigUser.cmake < ./configs/${VER%.*}/static/cmake/ConfigUserAdvancedTemplate.cmake.patch
    6367patch ./src/cmake/modules/FindGDAL.cmake < ./configs/${VER%.*}/static/cmake/modules/FindGDAL.cmake.patch
     68patch ./src/cmake/modules/FindGLIB.cmake < ./configs/${VER%.*}/static/cmake/modules/FindGLIB.cmake.patch
    6469patch ./src/cmake/modules/FindGSHHG.cmake < ./configs/${VER%.*}/static/cmake/modules/FindGSHHG.cmake.patch
    6570patch ./src/cmake/modules/FindNETCDF.cmake < ./configs/${VER%.*}/static/cmake/modules/FindNETCDF.cmake.patch
    … …  
    7984cmake \
    8085        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
    81         -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
     86        -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a" \
    8287        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
    83         -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a;${LIBSSL}" \
     88        -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \
    8489        -DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \
    85         -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
     90        -DGLIB_GTHREAD_LIBRARIES="${LIBGLIB_ROOT}/libgthread-2.0.a" \
     91        -DGLIB_LIBRARY="${LIBGLIB} ${LIBINTL} -liconv ${LIBPCRE} -framework Foundation" \
     92        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a" \
    8693        -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \
    8794        ..

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac.sh

    r28178 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    99PREFIX="${ISSM_DIR}/externalpackages/gmt/install"
    1010
    11 # Find libgfortran so that we do not have to hardcode it.
     11# Find certain libraries so we do not have to hardcode them
    1212#
    1313# TODO:
    … …  
    1515#
    1616echo "Finding libgfortran..."
    17 LIBGFORTRAN=$(find /usr /opt -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     17LIBGFORTRAN=$(find /usr /opt -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    1818LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    1919
    … …  
    2121#
    2222export CC=mpicc
     23export CFLAGS="${CFLAGS} -w"
    2324
    2425# Download source
    … …  
    4142# Patch source
    4243patch ./src/cmake/ConfigUser.cmake < ./configs/${VER%.*}/cmake/ConfigUserAdvancedTemplate.cmake.patch
    43 patch ./src/cmake/modules/ConfigCMake.cmake < ./configs/${VER%.*}/cmake/modules/ConfigCMake.cmake.patch
     44patch ./src/cmake/modules/ConfigCMake.cmake < ./configs/${VER%.*}/mac/cmake/modules/ConfigCMake.cmake.patch
    4445
    4546# Configure

  • issm/trunk-jpl/externalpackages/hdf5/install-1-static.sh

    r28191 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    55## Constants
    66#
    7 VER="1.8.23"
     7VER="1.14.3"
    88
    99PREFIX="${ISSM_DIR}/externalpackages/hdf5/install" # Set to location where external package should be installed
    1010
    11 ## Environnment
     11## Environment
    1212#
    1313export CC=mpicc
     14export CFLAGS="${CFLAGS} -w"
    1415
    1516# Download source
    … …  
    3536        --enable-parallel \
    3637        --with-zlib="${ZLIB_ROOT}" \
     38        --with-szlib="no" \
    3739        --enable-hl
    3840

  • issm/trunk-jpl/externalpackages/hdf5/install-1.sh

    r28021 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    55## Constants
    66#
    7 VER="1.8.23"
     7VER="1.14.3"
    88
    99PREFIX="${ISSM_DIR}/externalpackages/hdf5/install" # Set to location where external package should be installed
     10
     11## Environment
     12#
     13export CC=mpicc
     14export CFLAGS="${CFLAGS} -w"
    1015
    1116# Download source
    … …  
    3035        --disable-static \
    3136        --with-zlib="${ZLIB_ROOT}" \
     37        --with-szlib="no" \
    3238        --enable-hl
    3339

  • issm/trunk-jpl/externalpackages/netcdf/install-4-static.sh

    r28191 r28197  
    11#!/bin/bash
    2 set -eu
     2set -e
    33
    44
    … …  
    2323# Constants
    2424#
    25 VER="4.7.2"
     25VER="4.9.2"
    2626
    2727PREFIX="${ISSM_DIR}/externalpackages/netcdf/install" # Set to location where external package should be installed
    … …  
    3030#
    3131export CC=mpicc
    32 export CPPFLAGS="-I${ZLIB_ROOT}/include"
    33 
    34 export ZLIB="${ZLIB_ROOT}/lib/libz.a"
     32export CFLAGS="${CFLAGS} -w"
    3533
    3634# Download source
    … …  
    5048# Configure
    5149cd src
    52 ./configure \
    53         --prefix="${PREFIX}" \
    54         --disable-shared \
    55         --disable-dependency-tracking \
    56         --enable-fast-install \
    57         --disable-doxygen \
    58         --enable-netcdf4 \
    59         --disable-dap \
    60         --disable-testsets \
    61         --disable-examples \
    62         --disable-filter-testing
     50cmake \
     51        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
     52        -DBUILD_SHARED_LIBS=OFF \
     53        -DENABLE_NETCDF_4=ON \
     54        -DENABLE_DAP=OFF \
     55        -DENABLE_TESTS=OFF \
     56        -DENABLE_PARALLEL4=ON \
     57        -DENABLE_CDF5=ON \
     58        -DENABLE_PARALLEL_TESTS=OFF
    6359
    6460# Compile and install

  • issm/trunk-jpl/externalpackages/netcdf/install-4.sh

    r28191 r28197  
    1515# Constants
    1616#
    17 VER="4.7.2"
     17VER="4.9.2"
    1818
    1919PREFIX="${ISSM_DIR}/externalpackages/netcdf/install" # Set to location where external package should be installed
    … …  
    2121# Environment
    2222#
    23 export CPPFLAGS="-I${HDF5_ROOT}/include -I${CURL_ROOT}/include -I${ZLIB_ROOT}/include"
    24 export LDFLAGS="-L${HDF5_ROOT}/lib -L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib"
     23export CC=mpicc
     24export CFLAGS="${CFLAGS} -w"
    2525
    2626# Download source
    … …  
    4040# Configure
    4141cd src
    42 ./configure \
    43         --prefix="${PREFIX}" \
    44         --disable-static \
    45         --disable-dependency-tracking \
    46         --enable-fast-install \
    47         --disable-doxygen \
    48         --disable-testsets \
    49         --disable-examples \
    50         --enable-netcdf4
     42cmake \
     43        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
     44        -DBUILD_SHARED_LIBS=ON \
     45        -DENABLE_NETCDF_4=ON \
     46        -DENABLE_DAP=OFF \
     47        -DENABLE_TESTS=OFF \
     48        -DENABLE_PARALLEL4=ON \
     49        -DENABLE_CDF5=ON \
     50        -DENABLE_PARALLEL_TESTS=OFF
    5151
    5252# Compile and install

  • issm/trunk-jpl/externalpackages/petsc/install-3.20-linux-static.sh

    r28178 r28197  
    4646        --with-ssl=0 \
    4747        --download-fblaslapack=1 \
     48        --download-metis=1 \
    4849        --download-mpich=1 \
    49         --download-metis=1 \
     50        --download-mumps=1 \
    5051        --download-parmetis=1 \
    5152        --download-scalapack=1 \
    52         --download-mumps=1 \
     53        --download-szlib=1 \
    5354        --download-zlib=1
    5455

  • issm/trunk-jpl/externalpackages/petsc/install-3.20-linux.sh

    r28178 r28197  
    3434        --with-pic=1 \
    3535        --download-fblaslapack=1 \
     36        --download-metis=1 \
    3637        --download-mpich=1 \
    37         --download-metis=1 \
     38        --download-mumps=1 \
    3839        --download-parmetis=1 \
    3940        --download-scalapack=1 \
    40         --download-mumps=1 \
     41        --download-szlib=1 \
    4142        --download-zlib=1
    4243

  • issm/trunk-jpl/externalpackages/petsc/install-3.20-mac-static.sh

    r28161 r28197  
    4747        --with-ssl=0 \
    4848        --download-fblaslapack=1 \
     49        --download-metis=1 \
    4950        --download-mpich="https://www.mpich.org/static/downloads/4.2.0/mpich-4.2.0.tar.gz" \
    50         --download-metis=1 \
     51        --download-mumps=1 \
    5152        --download-parmetis=1 \
    5253        --download-scalapack=1 \
    53         --download-mumps=1 \
     54        --download-szlib=1 \
    5455        --download-zlib=1
    5556

  • issm/trunk-jpl/externalpackages/petsc/install-3.20-mac.sh

    r28161 r28197  
    4141        --with-pic=1 \
    4242        --download-fblaslapack=1 \
     43        --download-metis=1 \
    4344        --download-mpich="https://www.mpich.org/static/downloads/4.2.0/mpich-4.2.0.tar.gz" \
    44         --download-metis=1 \
     45        --download-mumps=1 \
    4546        --download-parmetis=1 \
    4647        --download-scalapack=1 \
    47         --download-mumps=1 \
     48        --download-szlib=1 \
    4849        --download-zlib=1
    4950

  • issm/trunk-jpl/externalpackages/zlib/install-1.sh

    r28196 r28197  
    77VER="1.2.11"
    88
     9PREFIX="${ISSM_DIR}/externalpackages/zlib/install" # Set to location where external package should be installed
     10
     11# Cleanup
     12rm -rf ${PREFIX} src
     13mkdir -p ${PREFIX} src
     14
    915# Download source
    1016$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/zlib-${VER}.tar.gz" "zlib-${VER}.tar.gz"
    1117
    1218# Unpack source
    13 tar -zxvf zlib-$VER.tar.gz
     19tar -zxvf zlib-${VER}.tar.gz
    1420
    15 # Cleanup
    16 rm -rf install src
    17 mkdir install src
    18 
    19 # Move source to 'src' directory
    20 mv zlib-$VER/* src/
    21 rm -rf zlib-$VER
     21# Move source into 'src' directory
     22mv zlib-${VER}/* src/
     23rm -rf zlib-${VER}
    2224
    2325# Configure
    2426cd src
    2527./configure \
    26         --prefix="${ISSM_DIR}/externalpackages/zlib/install"
     28        --prefix="${PREFIX}"
    2729
    2830# Compile and install
    … …  
    3436        make -j $1 install
    3537fi
    36 
    37 # Return to initial directory
    38 cd ..

  • issm/trunk-jpl/jenkins/mac-intel-binaries-matlab

    r28161 r28197  
    5555        chaco           install-mac.sh
    5656        curl            install-7-mac-static.sh
    57         hdf5            install-1-parallel-static.sh
    58         netcdf          install-4.7-parallel-static.sh
     57        hdf5            install-1-static.sh
     58        netcdf          install-4-static.sh
    5959        proj            install-6-static.sh
    6060        gdal            install-3-static.sh

  • issm/trunk-jpl/jenkins/mac-intel-binaries-python-3

    r28161 r28197  
    5757        chaco           install-mac.sh
    5858        curl            install-7-mac-static.sh
    59         hdf5            install-1-parallel-static.sh
    60         netcdf          install-4.7-parallel-static.sh
     59        hdf5            install-1-static.sh
     60        netcdf          install-4-static.sh
    6161        proj            install-6-static.sh
    6262        gdal            install-3-python-static.sh

  • issm/trunk-jpl/jenkins/mac-intel-dakota

    r28140 r28197  
    5353        chaco           install-mac.sh
    5454        curl            install-7-mac.sh
    55         hdf5            install-1-parallel.sh
    56         netcdf          install-4.7-parallel.sh
     55        hdf5            install-1.sh
     56        netcdf          install-4.sh
    5757        proj            install-6.sh
    5858        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/mac-intel-examples

    r28140 r28197  
    5353        chaco           install-mac.sh
    5454        curl            install-7-mac.sh
    55         hdf5            install-1-parallel.sh
    56         netcdf          install-4.7-parallel.sh
     55        hdf5            install-1.sh
     56        netcdf          install-4.sh
    5757        proj            install-6.sh
    5858        gdal            install-3.sh

  • issm/trunk-jpl/jenkins/mac-intel-full

    r28140 r28197  
    5757        chaco           install-mac.sh
    5858        curl            install-7-mac.sh
    59         hdf5            install-1-parallel.sh
    60         netcdf          install-4.7-parallel.sh
     59        hdf5            install-1.sh
     60        netcdf          install-4.sh
    6161        proj            install-6.sh
    6262        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/mac-intel-solid_earth

    r28140 r28197  
    5757        chaco           install-mac.sh
    5858        curl            install-7-mac.sh
    59         hdf5            install-1-parallel.sh
    60         netcdf          install-4.7-parallel.sh
     59        hdf5            install-1.sh
     60        netcdf          install-4.sh
    6161        proj            install-6.sh
    6262        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/mac-silicon-binaries-matlab

    r28183 r28197  
    5555        chaco           install-mac.sh
    5656        curl            install-7-mac-static.sh
    57         hdf5            install-1-parallel-static.sh
    58         netcdf          install-4.7-parallel-static.sh
     57        hdf5            install-1-static.sh
     58        netcdf          install-4-static.sh
    5959        proj            install-6-static.sh
    6060        gdal            install-3-static.sh

  • issm/trunk-jpl/jenkins/mac-silicon-binaries-python-3

    r28183 r28197  
    5656        chaco           install-mac.sh
    5757        curl            install-7-mac-static.sh
    58         hdf5            install-1-parallel-static.sh
    59         netcdf          install-4.7-parallel-static.sh
     58        hdf5            install-1-static.sh
     59        netcdf          install-4-static.sh
    6060        proj            install-6-static.sh
    6161        gdal            install-3-python-static.sh

  • issm/trunk-jpl/jenkins/mac-silicon-dakota

    r28142 r28197  
    4848        chaco           install-mac.sh
    4949        curl            install-7-mac.sh
    50         hdf5            install-1-parallel.sh
    51         netcdf          install-4.7-parallel.sh
     50        hdf5            install-1.sh
     51        netcdf          install-4.sh
    5252        proj            install-6.sh
    5353        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/mac-silicon-examples

    r28140 r28197  
    4545        chaco           install-mac.sh
    4646        curl            install-7-mac.sh
    47         hdf5            install-1-parallel.sh
    48         netcdf          install-4.7-parallel.sh
     47        hdf5            install-1.sh
     48        netcdf          install-4.sh
    4949        proj            install-6.sh
    5050        gdal            install-3.sh

  • issm/trunk-jpl/jenkins/mac-silicon-full

    r28140 r28197  
    4848        chaco           install-mac.sh
    4949        curl            install-7-mac.sh
    50         hdf5            install-1-parallel.sh
    51         netcdf          install-4.7-parallel.sh
     50        hdf5            install-1.sh
     51        netcdf          install-4.sh
    5252        proj            install-6.sh
    5353        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/mac-silicon-solid_earth

    r28140 r28197  
    4848        chaco           install-mac.sh
    4949        curl            install-7-mac.sh
    50         hdf5            install-1-parallel.sh
    51         netcdf          install-4.7-parallel.sh
     50        hdf5            install-1.sh
     51        netcdf          install-4.sh
    5252        proj            install-6.sh
    5353        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/pleiades-solid_earth

    r28079 r28197  
    4040        petsc           install-3.14-pleiades.sh
    4141        zlib            install-1.sh
    42         hdf5            install-1-parallel.sh
     42        hdf5            install-1.sh
    4343        gsl                     install-pleiades.sh
    4444        boost           install-1.55-pleiades.sh
    … …  
    4646        chaco           install-linux.sh
    4747        curl            install-7-linux.sh
    48         netcdf          install-4.7-parallel.sh
     48        netcdf          install-4.sh
    4949        sqlite          install.sh
    5050        proj            install-6.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab

    r28178 r28197  
    5151        chaco           install-linux.sh
    5252        curl            install-7-linux-static.sh
    53         hdf5            install-1-parallel-static.sh
    54         netcdf          install-4.7-parallel-static.sh
     53        hdf5            install-1-static.sh
     54        netcdf          install-4-static.sh
    5555        proj            install-6-static.sh
    5656        gdal            install-3-static.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-binaries-python-3

    r28178 r28197  
    5252        chaco           install-linux.sh
    5353        curl            install-7-linux-static.sh
    54         hdf5            install-1-parallel-static.sh
    55         netcdf          install-4.7-parallel-static.sh
     54        hdf5            install-1-static.sh
     55        netcdf          install-4-static.sh
    5656        proj            install-6-static.sh
    5757        gdal            install-3-python-static.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-dakota

    r28178 r28197  
    5050        chaco                   install-linux.sh
    5151        curl                    install-7-linux.sh
    52         hdf5                    install-1-parallel.sh
    53         netcdf                  install-4.7-parallel.sh
     52        hdf5                    install-1.sh
     53        netcdf                  install-4.sh
    5454        proj                    install-6.sh
    5555        gdal                    install-3-python.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-full

    r28178 r28197  
    5151        chaco           install-linux.sh
    5252        curl            install-7-linux.sh
    53         hdf5            install-1-parallel.sh
    54         netcdf          install-4.7-parallel.sh
     53        hdf5            install-1.sh
     54        netcdf          install-4.sh
    5555        proj            install-6.sh
    5656        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack

    r28178 r28197  
    5151        chaco           install-linux.sh
    5252        curl            install-7-linux.sh
    53         hdf5            install-1-parallel.sh
    54         netcdf          install-4.7-parallel.sh
     53        hdf5            install-1.sh
     54        netcdf          install-4.sh
    5555        proj            install-6.sh
    5656        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind

    r28178 r28197  
    5050        chaco           install-linux.sh
    5151        curl            install-7-linux.sh
    52         hdf5            install-1-parallel.sh
    53         netcdf          install-4.7-parallel.sh
     52        hdf5            install-1.sh
     53        netcdf          install-4.sh
    5454        proj            install-6.sh
    5555        gdal            install-3-python.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

    r28178 r28197  
    4848        chaco                   install-linux.sh
    4949        curl                    install-7-linux.sh
    50         hdf5                    install-1-parallel.sh
    51         netcdf                  install-4.7-parallel.sh
     50        hdf5                    install-1.sh
     51        netcdf                  install-4.sh
    5252        proj                    install-6.sh
    5353        gdal                    install-3-python.sh

  • issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh

    r28192 r28197  
    3434## Constants
    3535#
    36 MATLAB_NROPTIONS="'benchmark','all','exclude',[125:126,129,234:235,418,420,435,444:445,456,701:703,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2051:2053,2084:2085,2090:2092,2101,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     36MATLAB_NROPTIONS="'benchmark','all','exclude',[125:126,129,234:235,418,420,435,444:445,456,701:703,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    3737MATLAB_PATH="/usr/local/MATLAB/R2023b"
    3838

  • issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python-3.sh

    r28192 r28197  
    3535#
    3636PKG="ISSM-Linux-Python-3" # Name of directory to copy distributable files to
    37 PYTHON_NROPTIONS="--benchmark all --exclude 125:126 129 234:235 418 420 435 444:445 456 701:703 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2010:2013 2020:2021 2051:2053 2084:2085 2090:2092 2101 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     37PYTHON_NROPTIONS="--benchmark all --exclude 125:126 129 234:235 418 420 435 444:445 456 701:703 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    3838
    3939COMPRESSED_PKG="${PKG}.tar.gz"

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh

    r28192 r28197  
    3333LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    3434LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     35LIBGMT="${ISSM_DIR}/externalpackages/gmt/install/lib/libgmt.6.5.0.dylib" # Important that this is the library itself
     36LIBGMT_DIST="${ISSM_DIR}/lib/libgmt.6.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     37LIBPSL="${ISSM_DIR}/externalpackages/gmt/install/lib/libpostscriptlight.6.5.0.dylib" # Important that this is the library itself
     38LIBPSL_DIST="${ISSM_DIR}/lib/libpostscriptlight.6.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    3539LIBQUADMATH="/usr/lib/x86_64-linux-gnu/libquadmath.so.0.0.0" # Important that this is the library itself
    3640LIBQUADMATH_DIST="${ISSM_DIR}/lib/libquadmath.so.0" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    … …  
    7478cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
    7579
    76 echo "Moving libgfortran and libquadmath to lib/"
    77 cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2> /dev/null
    78 cp ${LIBQUADMATH} ${LIBQUADMATH_DIST} 2> /dev/null
     80echo "Moving certain shared libraries to lib/"
     81cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2>/dev/null
     82cp ${LIBQUADMATH} ${LIBQUADMATH_DIST} 2>/dev/null
     83cp ${LIBGMT} ${LIBGMT_DIST} 2>/dev/null
     84cp ${LIBPSL} ${LIBPSL_DIST} 2>/dev/null
    7985
    8086echo "Moving MPICH binaries to bin/"
    … …  
    100106
    101107echo "Moving GMT binaries to bin/"
    102 if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
    103         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null
    104         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null
     108if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt ]; then
     109        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
     110elif [ -f ${ISSM_EXT_STATIC_DIR}/gmt/install/bin/gmtselect ]; then
     111        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
    105112else
    106113        echo "GMT not found"
    … …  
    118125echo "Moving GSHHG assets to share/"
    119126if [ -d ${ISSM_DIR}/externalpackages/gshhg/install ]; then
    120         mkdir ${ISSM_DIR}/share 2> /dev/null
     127        mkdir ${ISSM_DIR}/share 2>/dev/null
    121128        cp -R ${ISSM_DIR}/externalpackages/gshhg/install/*.nc ${ISSM_DIR}/share
    122129else
    … …  
    128135if [ -d ${ISSM_DIR}/externalpackages/proj/install/share/proj ]; then
    129136        cp ${ISSM_DIR}/externalpackages/proj/install/bin/projinfo .
    130         mkdir ${ISSM_DIR}/share 2> /dev/null
     137        mkdir ${ISSM_DIR}/share 2>/dev/null
    131138        cp -R ${ISSM_DIR}/externalpackages/proj/install/share/proj ${ISSM_DIR}/share
    132139else
    … …  
    139146        echo "Running tests"
    140147        cd ${ISSM_DIR}/test/NightlyRun
    141         rm matlab.log 2> /dev/null
     148        rm matlab.log 2>/dev/null
    142149
    143150        # Run tests, redirecting output to logfile and suppressing output to console

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh

    r28192 r28197  
    3333LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    3434LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     35LIBGMT="${ISSM_DIR}/externalpackages/gmt/install/lib/libgmt.6.5.0.dylib" # Important that this is the library itself
     36LIBGMT_DIST="${ISSM_DIR}/lib/libgmt.6.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     37LIBPSL="${ISSM_DIR}/externalpackages/gmt/install/lib/libpostscriptlight.6.5.0.dylib" # Important that this is the library itself
     38LIBPSL_DIST="${ISSM_DIR}/lib/libpostscriptlight.6.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    3539LIBQUADMATH="/usr/lib/x86_64-linux-gnu/libquadmath.so.0.0.0" # Important that this is the library itself
    3640LIBQUADMATH_DIST="${ISSM_DIR}/lib/libquadmath.so.0" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    … …  
    6872cat generic_static.py | sed -e "s/generic_static/generic/g" > generic.py
    6973
    70 echo "Moving libgfortran and libquadmath to lib/"
    71 cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2> /dev/null
    72 cp ${LIBQUADMATH} ${LIBQUADMATH_DIST} 2> /dev/null
     74echo "Moving certain shared libraries to lib/"
     75cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2>/dev/null
     76cp ${LIBQUADMATH} ${LIBQUADMATH_DIST} 2>/dev/null
     77cp ${LIBGMT} ${LIBGMT_DIST} 2>/dev/null
     78cp ${LIBPSL} ${LIBPSL_DIST} 2>/dev/null
    7379
    7480echo "Moving MPICH binaries to bin/"
    … …  
    94100
    95101echo "Moving GMT binaries to bin/"
    96 if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
    97         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null
    98         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null
     102if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt ]; then
     103        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
     104elif [ -f ${ISSM_EXT_STATIC_DIR}/gmt/install/bin/gmtselect ]; then
     105        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
    99106else
    100107        echo "GMT not found"
    … …  
    112119echo "Moving GSHHG assets to share/"
    113120if [ -d ${ISSM_DIR}/externalpackages/gshhg/install ]; then
    114         mkdir ${ISSM_DIR}/share 2> /dev/null
     121        mkdir ${ISSM_DIR}/share 2>/dev/null
    115122        cp -R ${ISSM_DIR}/externalpackages/gshhg/install/*.nc ${ISSM_DIR}/share
    116123else
    … …  
    122129if [ -d ${ISSM_DIR}/externalpackages/proj/install/share/proj ]; then
    123130        cp ${ISSM_DIR}/externalpackages/proj/install/bin/projinfo .
    124         mkdir ${ISSM_DIR}/share 2> /dev/null
     131        mkdir ${ISSM_DIR}/share 2>/dev/null
    125132        cp -R ${ISSM_DIR}/externalpackages/proj/install/share/proj ${ISSM_DIR}/share
    126133else
    … …  
    133140        echo "Running tests"
    134141        cd ${ISSM_DIR}/test/NightlyRun
    135         rm python.log 2> /dev/null
     142        rm python.log 2>/dev/null
    136143
    137144        # Set Python environment

  • issm/trunk-jpl/packagers/mac/complete-issm-mac-intel-binaries-matlab.sh

    r28192 r28197  
    6464## Constants
    6565#
    66 MATLAB_NROPTIONS="'benchmark','all','exclude',[124:126,129,234:235,418,420,435,444:445,456,701:703,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2010:2013,2020:2021,2051:2053,2084:2085,2090:2092,2101,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     66MATLAB_NROPTIONS="'benchmark','all','exclude',[124:126,129,234:235,418,420,435,444:445,456,701:703,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    6767MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    6868PKG="ISSM-macOS-Intel-MATLAB" # Name of directory to copy distributable files to

  • issm/trunk-jpl/packagers/mac/complete-issm-mac-intel-binaries-python-3.sh

    r28192 r28197  
    6565#
    6666PKG="ISSM-macOS-Intel-Python-3" # Name of directory to copy distributable files to
    67 PYTHON_NROPTIONS="--benchmark all --exclude 124:126 129 234:235 418 420 435 444:445 456 701:703 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2010:2013 2020:2021 2051:2053 2084:2085 2090:2092 2101 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     67PYTHON_NROPTIONS="--benchmark all --exclude 124:126 129 234:235 418 420 435 444:445 456 701:703 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    6868REPO_BASE_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/intel/python/3"
    6969SIGNED_REPO_COPY="./signed"

  • issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh

    r28192 r28197  
    6464## Constants
    6565#
    66 MATLAB_NROPTIONS="'benchmark','all','exclude',[119,124:126,129,216,234:235,274,418,420,423,430,433,435,441:442,444:445,448,456,462:464,470:476,508,517,544,546,701:703,808,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2010:2013,2020:2021,2051:2053,2084:2085,2090:2092,2101,2110:2113,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     66MATLAB_NROPTIONS="'benchmark','all','exclude',[119,124:126,129,216,234:235,274,418,420,423,430,433,435,441:442,444:445,448,456,462:464,470:476,508,517,544,546,701:703,808,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002,2004,2006,2010:2013,2020:2021,2052:2053,2085,2090:2092,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    6767MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    6868PKG="ISSM-macOS-Silicon-MATLAB" # Name of directory to copy distributable files to

  • issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-python-3.sh

    r28192 r28197  
    6565#
    6666PKG="ISSM-macOS-Silicon-Python-3" # Name of directory to copy distributable files to
    67 PYTHON_NROPTIONS="--benchmark all --exclude 119 124:126 129 216 234:235 274 418 420 423 430 433 435 441:442 444:445 448 456 462:464 470:476 508 517 544 546 701:703 808 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2010:2013 2020:2021 2051:2053 2084:2085 2090:2092 2101 2110:2113 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     67PYTHON_NROPTIONS="--benchmark all --exclude 119 124:126 129 216 234:235 274 418 420 423 430 433 435 441:442 444:445 448 456 462:464 470:476 508 517 544 546 701:703 808 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002 2004 2006 2010:2013 2020:2021 2052:2053 2085 2090:2092 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    6868REPO_BASE_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/silicon/python/3"
    6969SIGNED_REPO_COPY="./signed"

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh

    r28192 r28197  
    4242alias grep=$(which grep)
    4343
     44## Constants
     45#
     46LIBGMT="${ISSM_DIR}/externalpackages/gmt/install/lib/libgmt.6.5.0.dylib" # Important that this is the library itself
     47LIBGMT_DIST="${ISSM_DIR}/lib/libgmt.6.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     48LIBPSL="${ISSM_DIR}/externalpackages/gmt/install/lib/libpostscriptlight.6.5.0.dylib" # Important that this is the library itself
     49LIBPSL_DIST="${ISSM_DIR}/lib/libpostscriptlight.6.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     50
    4451## Environment
    4552#
    … …  
    7986echo "Modify generic"
    8087cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
     88
     89echo "Moving certain shared libraries to lib/"
     90cp ${LIBGMT} ${LIBGMT_DIST} 2>/dev/null
     91cp ${LIBPSL} ${LIBPSL_DIST} 2>/dev/null
    8192
    8293echo "Moving MPICH binaries to bin/"
    … …  
    110121
    111122echo "Moving GMT binaries to bin/"
    112 if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
    113         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null
    114         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null
     123if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt ]; then
     124        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
     125elif [ -f ${ISSM_EXT_STATIC_DIR}/gmt/install/bin/gmtselect ]; then
     126        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
    115127else
    116128        echo "GMT not found"
    … …  
    120132echo "Moving GSHHG assets to share/"
    121133if [ -d ${ISSM_DIR}/externalpackages/gshhg/install ]; then
    122         mkdir ${ISSM_DIR}/share 2> /dev/null
     134        mkdir ${ISSM_DIR}/share 2>/dev/null
    123135        cp -R ${ISSM_DIR}/externalpackages/gshhg/install/*.nc ${ISSM_DIR}/share
    124136else
    … …  
    130142if [ -d ${ISSM_DIR}/externalpackages/proj/install/share/proj ]; then
    131143        cp ${ISSM_DIR}/externalpackages/proj/install/bin/projinfo .
    132         mkdir ${ISSM_DIR}/share 2> /dev/null
     144        mkdir ${ISSM_DIR}/share 2>/dev/null
    133145        cp -R ${ISSM_DIR}/externalpackages/proj/install/share/proj ${ISSM_DIR}/share
    134146else
    … …  
    141153        echo "Running tests"
    142154        cd ${ISSM_DIR}/test/NightlyRun
    143         rm matlab.log 2> /dev/null
     155        rm matlab.log 2>/dev/null
    144156
    145157        # Run tests, redirecting output to logfile and suppressing output to console

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh

    r28192 r28197  
    4040alias cp=$(which cp)
    4141alias grep=$(which grep)
     42
     43## Constants
     44#
     45LIBGMT="${ISSM_DIR}/externalpackages/gmt/install/lib/libgmt.6.5.0.dylib" # Important that this is the library itself
     46LIBGMT_DIST="${ISSM_DIR}/lib/libgmt.6.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     47LIBPSL="${ISSM_DIR}/externalpackages/gmt/install/lib/libpostscriptlight.6.5.0.dylib" # Important that this is the library itself
     48LIBPSL_DIST="${ISSM_DIR}/lib/libpostscriptlight.6.dylib" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    4249
    4350## Environment
    … …  
    7279echo "Modify generic"
    7380cat generic_static.py | sed -e "s/generic_static/generic/g" > generic.py
     81
     82echo "Moving certain shared libraries to lib/"
     83cp ${LIBGMT} ${LIBGMT_DIST} 2>/dev/null
     84cp ${LIBPSL} ${LIBPSL_DIST} 2>/dev/null
    7485
    7586echo "Moving MPICH binaries to bin/"
    … …  
    103114
    104115echo "Moving GMT binaries to bin/"
    105 if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
    106         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null
    107         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null
     116if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt ]; then
     117        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
     118elif [ -f ${ISSM_EXT_STATIC_DIR}/gmt/install/bin/gmtselect ]; then
     119        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
    108120else
    109121        echo "GMT not found"
    … …  
    113125echo "Moving GSHHG assets to share/"
    114126if [ -d ${ISSM_DIR}/externalpackages/gshhg/install ]; then
    115         mkdir ${ISSM_DIR}/share 2> /dev/null
     127        mkdir ${ISSM_DIR}/share 2>/dev/null
    116128        cp -R ${ISSM_DIR}/externalpackages/gshhg/install/*.nc ${ISSM_DIR}/share
    117129else
    … …  
    123135if [ -d ${ISSM_DIR}/externalpackages/proj/install/share/proj ]; then
    124136        cp ${ISSM_DIR}/externalpackages/proj/install/bin/projinfo .
    125         mkdir ${ISSM_DIR}/share 2> /dev/null
     137        mkdir ${ISSM_DIR}/share 2>/dev/null
    126138        cp -R ${ISSM_DIR}/externalpackages/proj/install/share/proj ${ISSM_DIR}/share
    127139else
    … …  
    134146        echo "Running tests"
    135147        cd ${ISSM_DIR}/test/NightlyRun
    136         rm python.log 2> /dev/null
     148        rm python.log 2>/dev/null
    137149
    138150        # Set Python environment
Note: See TracChangeset for help on using the changeset viewer.