Changeset 27541


Ignore:
Timestamp:
01/31/23 12:13:56 (2 years ago)
Author:
jdquinn
Message:

CHG: Jenkins config for new Intel-based Mac Mini; cleanup

Location:
issm/trunk-jpl
Files:
4 deleted
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh

    r27410 r27541  
    1717#
    1818echo "Finding libgfortran..."
    19 LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     19LIBGFORTRAN=$(find /usr /opt -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    2020LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    2121LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh

    r27406 r27541  
    1515#
    1616echo "Finding libgfortran..."
    17 LIBGFORTRAN=$(find /usr -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

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

    r27365 r27541  
    99## Constants
    1010#
    11 VER="3.1.1"
     11VER="3.5.3"
    1212
    1313## Environment
    1414#
    1515export CC=mpicc
     16export CXXFLAGS="-std=c++11"
    1617export CXX=mpicxx
    1718export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
    … …  
    4243        --enable-static \
    4344        --with-pic \
    44         --with-python \
     45        --with-python="python3" \
    4546        --with-curl="${CURL_ROOT}/bin/curl-config" \
    4647        --with-hdf5="${HDF5_ROOT}" \

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

    r27365 r27541  
    99## Constants
    1010#
    11 VER="3.1.1"
     11VER="3.5.3"
    1212
    1313## Environment
    … …  
    3434        --prefix="${PREFIX}" \
    3535        --enable-fast-install \
    36         --with-python \
     36        --with-python="python3" \
    3737        --with-hdf5="${HDF5_ROOT}" \
    3838        --with-libz="${ZLIB_ROOT}" \

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

    r27364 r27541  
    99## Constants
    1010#
    11 VER="3.1.1"
     11VER="3.5.3"
    1212
    1313## Environment
    1414#
    1515export CC=mpicc
     16export CXXFLAGS="-std=c++11"
    1617export CXX=mpicxx
    1718export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
    … …  
    3233mv gdal-${VER}/* src
    3334rm -rf gdal-${VER}
     35
     36# Apply patches to source
     37patch src/frmts/vrt/pixelfunctions.cpp < configs/3/frmts/vrt/pixelfunctions.cpp.patch
    3438
    3539# Configure

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

    r27189 r27541  
    55## Constants
    66#
    7 VER="3.5.1"
     7VER="3.5.3"
    88
    99## Environment

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

    r27410 r27541  
    3333#
    3434echo "Finding libgfortran..."
    35 LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     35LIBGFORTRAN=$(find /usr /opt -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    3636LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    3737LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)

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

    r27408 r27541  
    2525#
    2626echo "Finding libgfortran..."
    27 LIBGFORTRAN=$(find /usr -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%/*}
    2929

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

    r27406 r27541  
    55## Constants
    66#
    7 VER="6.0.0"
     7VER="6.4.0"
    88
    99# Find libgfortran and libgcc so we do not have to hardcode them

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

    r27410 r27541  
    55## Constants
    66#
    7 VER="6.0.0"
     7VER="6.4.0"
    88
    99# Find libgfortran and libgcc so we do not have to hardcode them
    … …  
    1515#
    1616echo "Finding libgfortran..."
    17 LIBGFORTRAN=$(find /usr -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%/*}
    1919LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)

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

    r27408 r27541  
    1313#
    1414echo "Finding libgfortran..."
    15 LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
     15LIBGFORTRAN=$(find /usr /opt -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    1616LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    1717

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

    r27540 r27541  
    33#--------------------#
    44
    5 MATLAB_PATH="/Applications/MATLAB_R2018a.app"
     5MATLAB_PATH="/Applications/MATLAB_R2022b.app"
    66
    77ISSM_CONFIG='\
    … …  
    3535        autotools       install-mac.sh
    3636        cmake           install.sh
    37         petsc           install-3.12-mac.sh
     37        petsc           install-3.17-mac-intel.sh
    3838        triangle        install-mac.sh
    3939        chaco           install-mac.sh
Note: See TracChangeset for help on using the changeset viewer.