Changeset 24454


Ignore:
Timestamp:
12/06/19 21:38:51 (5 years ago)
Author:
jdquinn
Message:

CHG: Configuration changes for solid earth build

Location:
issm/trunk-jpl
Files:
14 added
2 deleted
10 edited
7 copied

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/curl/install-7.67-with_tests.sh

    r24452 r24454  
    22set -eu
    33
    4 #Some cleanup
    5 rm -rf src install curl-7.39.0
    6 mkdir src install
    74
    8 #Download from ISSM server
    9 $ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/curl-7.39.0.tar.gz' 'curl-7.39.0.tar.gz'
     5## Constants
     6#
     7VER="7.67.0"
    108
    11 #Untar
    12 tar -zxvf  curl-7.39.0.tar.gz
     9# Download source
     10$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/curl-${VER}.tar.gz" "curl-${VER}.tar.gz"
    1311
    14 #Move curl into src directory
    15 mv curl-7.39.0/* src
    16 rm -rf curl-7.39.0
     12# Unpack source
     13tar -zxvf curl-$VER.tar.gz
    1714
    18 #Configure curl
     15# Cleanup
     16rm -rf install src
     17mkdir install src
     18
     19# Move source to 'src' directory
     20mv curl-$VER/* src
     21rm -rf curl-$VER
     22
     23# Configure
    1924cd src
     25./configure \
     26        --prefix="${ISSM_DIR}/externalpackages/curl/install" \
     27        --disable-manual
    2028
    21 export CFLAGS=" -arch x86_64"
    22 
    23 ./configure \
    24         --prefix="$ISSM_DIR/externalpackages/curl/install"
    25 
    26 #Compile curl
     29# Compile and install
    2730if [ $# -eq 0 ]; then
    2831        make
     32        make test
     33        make install
    2934else
    3035        make -j $1
     36        make -j $1 test
     37        make -j $1 install
    3138fi
    32 make install
     39
     40# Return to initial directory
     41cd ../..

  • issm/trunk-jpl/externalpackages/curl/install-7.67.sh

    r24452 r24454  
    22set -eu
    33
    4 #Some cleanup
    5 rm -rf src install curl-7.39.0
    6 mkdir src install
    74
    8 #Download from ISSM server
    9 $ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/curl-7.39.0.tar.gz' 'curl-7.39.0.tar.gz'
     5## Constants
     6#
     7VER="7.67.0"
    108
    11 #Untar
    12 tar -zxvf  curl-7.39.0.tar.gz
     9# Download source
     10$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/curl-${VER}.tar.gz" "curl-${VER}.tar.gz"
    1311
    14 #Move curl into src directory
    15 mv curl-7.39.0/* src
    16 rm -rf curl-7.39.0
     12# Unpack source
     13tar -zxvf curl-$VER.tar.gz
    1714
    18 #Configure curl
     15# Cleanup
     16rm -rf install src
     17mkdir install src
     18
     19# Move source to 'src' directory
     20mv curl-$VER/* src
     21rm -rf curl-$VER
     22
     23# Configure
    1924cd src
     25./configure \
     26        --prefix="${ISSM_DIR}/externalpackages/curl/install" \
     27        --disable-manual \
     28        --disable-verbose
    2029
    21 export CFLAGS=" -arch x86_64"
    22 
    23 ./configure \
    24         --prefix="$ISSM_DIR/externalpackages/curl/install"
    25 
    26 #Compile curl
     30# Compile and install
    2731if [ $# -eq 0 ]; then
    2832        make
     33        make install
    2934else
    3035        make -j $1
     36        make -j $1 install
    3137fi
    32 make install
     38
     39# Return to initial directory
     40cd ../..

  • issm/trunk-jpl/externalpackages/gdal/install-1.10-debian-netcdf.sh

    r24452 r24454  
    55# Constants
    66#
    7 VER="3.0.2"
     7VER="1.10.0"
    88HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
    99NETCDF_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
    … …  
    1515
    1616# Download source
    17 $ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
     17$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz"
    1818
    1919# Unpack source
    20 tar -zxvf gdal-$VER.tar.gz
     20tar -zxvf gdal-${VER}.tar.gz
    2121
    2222# Move source into 'src' directory
    23 mv gdal-$VER/* src
    24 rm -rf gdal-$VER
     23mv gdal-${VER}/* src
     24rm -rf gdal-${VER}
     25
     26# Copy customized source files to 'src' directory
     27cp configs/1.10/linux/debian/frmts/wms/dataset.cpp src/frmts/wms
     28cp configs/1.10/linux/debian/ogr/ogrsf_frmts/vfk/vfkfeature.cpp src/ogr/ogrsf_frmts/vfk
     29cp configs/1.10/linux/debian/port/cplkeywordparser.cpp src/port
    2530
    2631# Configure

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

    r24415 r24454  
    77#
    88
    9 # Constants
     9## Constants
    1010#
    1111VER="3.0.2"

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

    r24380 r24454  
    1616
    1717# Unpack source
    18 tar -zxvf gdal-$VER.tar.gz
     18tar -zxvf gdal-${VER}.tar.gz
    1919
    2020# Move source into 'src' directory
    … …  
    3030        --with-proj="${PROJ_ROOT}"
    3131
    32 
    3332# Compile and install
    3433if [ $# -eq 0 ]; then

  • issm/trunk-jpl/externalpackages/gmt/configs/linux/5.1/cmake/ConfigUser.cmake

    r24416 r24454  
    11#
    2 #
    3 # Copyright (c) 1991-2019 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
     2# $Id: ConfigUserTemplate.cmake 12904 2014-02-17 20:52:35Z fwobbe $
     3#
     4# Copyright (c) 1991-2014 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
    45# See LICENSE.TXT file for copying and redistribution conditions.
    56#
    … …  
    1314# for more details.
    1415#
    15 # Contact info: www.generic-mapping-tools.org
     16# Contact info: gmt.soest.hawaii.edu
    1617# ----------------------------------------------------------------------------
    1718
    … …  
    1920# basis.  First copy 'ConfigUserTemplate.cmake' to 'ConfigUser.cmake', then
    2021# edit 'ConfigUser.cmake'.  'ConfigUser.cmake' is not version controlled
    21 # (currently listed in .gitignore).
     22# (currently listed in svn:ignore property)
    2223#
    2324# Note: CMake considers an empty string, "FALSE", "OFF", "NO", or any string
    … …  
    3435# Basic setup begins here.  All settings are optional.  In most cases, setting
    3536# CMAKE_INSTALL_PREFIX should be all you need to do in order to build GMT with
    36 # reasonable defaults enabled.  Note: If you need to specify directory names
    37 # with spaces (e.g., on Windows) then you must put them in quotes.
     37# reasonable defaults enabled.
    3838# ============================================================================
    3939
    … …  
    5353#set (GMT_INSTALL_MODULE_LINKS FALSE)
    5454
    55 # Make executables relocatable on supported platforms (relative RPATH) [FALSE]:
    56 set (GMT_INSTALL_RELOCATABLE TRUE)
    57 
    58 # Exclude optional GDAL, PCRE, PCRE2, FFTW3, LAPACK, BLAS, ZLIB dependencies even if you have them installed [FALSE]
    59 #set (GMT_EXCLUDE_GDAL TRUE)
    60 #set (GMT_EXCLUDE_PCRE TRUE)
    61 #set (GMT_EXCLUDE_PCRE2 TRUE)
    62 #set (GMT_EXCLUDE_FFTW3 TRUE)
    63 #set (GMT_EXCLUDE_LAPACK TRUE)
    64 #set (GMT_EXCLUDE_BLAS TRUE)
    65 #set (GMT_EXCLUDE_ZLIB TRUE)
     55# Make executables relocatable on supported platforms (relative RPATH) [TRUE]:
     56#set (GMT_INSTALL_RELOCATABLE FALSE)
    6657
    6758# ============================================================================
    … …  
    9384
    9485# Install documentation files from this external location instead of creating
    95 # new HTML documents from scratch [${GMT_SOURCE_DIR}/doc_release]:
     86# new PDF and HTML documents from scratch [${GMT_SOURCE_DIR}/doc_release]:
    9687#set (GMT_INSTALL_EXTERNAL_DOC OFF)
    9788
    … …  
    10596##
    10697
    107 # Set URL to GMT Data server [auto]:
    108 #set (GMT_DATA_SERVER "data_server_url")
    109 
    11098# Set path to GSHHG Shoreline Database [auto]:
    11199set (GSHHG_ROOT "$ENV{ISSM_DIR}/externalpackages/gshhg/install")
    112100
    113 # Copy GSHHG files to ${GMT_DATADIR}/coast [FALSE]:
     101# Copy GSHHG files to $/coast [FALSE]:
    114102#set (COPY_GSHHG TRUE)
    115103
    … …  
    117105#set (DCW_ROOT "dcw-gmt_path")
    118106
    119 # Copy DCW files to ${GMT_DATADIR}/dcw [FALSE]:
     107# Copy DCW files to $/dcw [FALSE]:
    120108#set (COPY_DCW TRUE)
    121 
    122 # Copy GDAL's 'data' directory to ${GMT_DATADIR}/GDAL_DATA [FALSE]:
    123 #set (GDAL_DATA_PATH C:/programs/compa_libs/gdal_GIT/compileds/VC14_64/data)
    124 
    125 # Copy PROJ4's 'share' directory to ${GMT_DATADIR}/GDAL_DATA [FALSE]:
    126 #set (PROJ_DATA_PATH C:/programs/compa_libs/proj5_GIT/compileds/VC14_64/share/proj)
    127 
    128 # FOR WINDOWS ONLY
    129 # Set path to location of Ghostscript binaries (optional install)
    130 #set (GHOST_DATA_PATH C:/programs/compa_libs/ghostscript/bin)
    131 
    132 # FOR WINDOWS ONLY
    133 # Set path to location where the gmtmex is located.
    134 #set (GMTMEX_PATH "C:/progs_cygw/GMTdev/gmtmex/${GMTver}")
    135109
    136110# Set location of NetCDF (can be root directory, path to header file or path
    137111# to nc-config) [auto]:
    138 set (NETCDF_ROOT "$ENV{ISSM_DIR}/externalpackages/petsc/install")
     112set (NETCDF_ROOT "$ENV{ISSM_DIR}/externalpackages/netcdf/install")
    139113
    140114# Set location of GDAL (can be root directory, path to header file or path to
    … …  
    145119# pcre-config) [auto]:
    146120#set (PCRE_ROOT "pcre_install_prefix")
    147 # Alternatively, set location of PCRE2 (can be root directory, path to header file or path to
    148 # pcre2-config) [auto]:
    149 #set (PCRE2_ROOT "pcre2_install_prefix")
    150121
    151122# Set location of single precision FFTW (can be root directory or path to
    … …  
    154125
    155126# Set location of ZLIB (can be root directory or path to header file) [auto]:
    156 set (ZLIB_ROOT "$ENV{ISSM_DIR}/externalpackages/petsc/install")
    157 
    158 # Set location of CURL (can be root directory or path to header file) [auto]:
    159 #set (CURL_ROOT "curl_install_prefix")
    160 
    161 # Set location of GLIB component gthread [auto].  This is an optional (and
    162 # experimental) option which you need to enable:
    163 #set (GMT_USE_THREADS TRUE)
    164 # If pkg-config is not installed (e.g. on Windows) you need to specify these:
    165 #set (GLIB_INCLUDE_DIR c:/path/to/glib-dev/include/glib-2.0)
    166 #set (GLIB_LIBRARIES c:/path/to/glib-dev/lib/glib-2.0.lib)
    167 
    168 # Set LAPACK location. Use this when want to link with LAPACK and it's not found automatically
    169 set (LAPACK_LIBRARY "-L$ENV{ISSM_DIR}/externalpackages/lapack/install/lib -llapack")
    170 set (BLAS_LIBRARY "-L$ENV{ISSM_DIR}/externalpackages/lapack/install/lib -lblas")
     127set (ZLIB_ROOT "$ENV{ISSM_DIR}/externalpackages/zlib/install")
    171128
    172129##
    … …  
    179136#set (LICENSE_RESTRICTED GPL)
    180137
    181 # Allow building of OpenMP if compiler supports it
    182 # set (GMT_ENABLE_OPENMP TRUE)
    183 
    184138# Configure default units (possible values are SI and US) [SI]:
    185139#set (UNITS "US")
    186140
    187141# Enable building of shared libraries [TRUE] (disable to use static libraries;
    188 # not recommended; on non-x86 architectures uncomment the next option as well):
     142# not recommended):
    189143#set (BUILD_SHARED_LIBS FALSE)
    190 
    191 # Create position independent code on all targets [auto] (needed for static
    192 # build on non-x86):
    193 #set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
    194144
    195145# Build GMT shared lib with supplemental modules [TRUE]:
    196146#set (BUILD_SUPPLEMENTS FALSE)
    197 
    198 # Build/Install GMT Developer include files [TRUE]:
    199 # This installs the extra include files and configured files needed by 3rd-party
    200 # developers.  Until we build a separate gmt-devel we include them in the main
    201 # Distribution.
    202 #set (BUILD_DEVELOPER FALSE)
    203147
    204148##
    … …  
    216160#set (DO_EXAMPLES TRUE)
    217161#set (DO_TESTS TRUE)
    218 #set (DO_ANIMATIONS TRUE)
    219162# Number of parallel test jobs with "make check":
    220163#set (N_TEST_JOBS 4)
    … …  
    227170# List extra sub-dirs of 'src' with a CMakeList.txt to build non-module codes
    228171# that link against the full gmt libs (not just the API; for building codes
    229 # that only need the GMT API, see the gmt-custom project).
     172# that only need the GMT API, see the gmtextension project).
    230173#set (EXTRA_BUILD_DIRS apidemo)
    231 # Uncomment the following line to enable running low-level C tests of the API
    232 #set (DO_API_TESTS ON)
    233174
    234175# Directory in which to install the release sources per default
    … …  
    250191
    251192# Extra debugging for developers:
    252 #if ( CMAKE_GENERATOR STREQUAL "Xcode" )
    253 ##      So Xcode can find the supplemental plug-ins during debug sessions
    254 #       add_definitions(-DXCODER)
    255 #   add_definitions(-DDEBUG_MODERN)                     # To set PPID == 0 during Xcode test
    256 #       message("Add Xcode definition for GMT")
    257 #endif()
    258193#add_definitions(-DDEBUG)
    259194#add_definitions(-DMEMDEBUG) # Turn on memory tracking see gmt_support.c for extra info
    … …  
    261196#set (CMAKE_C_FLAGS "-Wextra ${CMAKE_C_FLAGS}")            # extra warnings
    262197#set (CMAKE_C_FLAGS_DEBUG -ggdb3)                          # gdb debugging symbols
     198#set (CMAKE_C_FLAGS_RELEASE "-ggdb3 -O2 -Wuninitialized")  # check uninitialized variables
    263199#set (CMAKE_LINK_DEPENDS_DEBUG_MODE TRUE)                  # debug link dependencies
    264 if (HAVE_OPENMP)
    265         set (CMAKE_C_FLAGS_RELEASE "-ggdb3 -O2 -Wuninitialized -flax-vector-conversions")  # check uninitialized variables
    266 else (HAVE_OPENMP)
    267         set (CMAKE_C_FLAGS_RELEASE "-ggdb3 -O2 -Wuninitialized")  # check uninitialized variables
    268 endif (HAVE_OPENMP)
    269200
    270201#
    … …  
    292223# If want to rename the DLLs to something else than the default (e.g. to
    293224# append the bitness - Windows only)
    294 # WARNING: if using this option it is mandatory that the suffix starts with an underscore.
    295225#if (WIN32)
    296226# set (BITAGE 32)
    … …  
    307237#  add_definitions(/D_ALLOW_KEYWORD_MACROS)
    308238#endif(MSVC11)
     239
     240# vim: textwidth=78 noexpandtab tabstop=2 softtabstop=2 shiftwidth=2

  • issm/trunk-jpl/externalpackages/gmt/configs/linux/6.0/cmake/ConfigUser.cmake

    r24416 r24454  
    136136# Set location of NetCDF (can be root directory, path to header file or path
    137137# to nc-config) [auto]:
    138 set (NETCDF_ROOT "$ENV{ISSM_DIR}/externalpackages/petsc/install")
     138set (NETCDF_ROOT "$ENV{ISSM_DIR}/externalpackages/netcdf/install")
    139139
    140140# Set location of GDAL (can be root directory, path to header file or path to
    … …  
    154154
    155155# Set location of ZLIB (can be root directory or path to header file) [auto]:
    156 set (ZLIB_ROOT "$ENV{ISSM_DIR}/externalpackages/petsc/install")
     156set (ZLIB_ROOT "$ENV{ISSM_DIR}/externalpackages/zlib/install")
    157157
    158158# Set location of CURL (can be root directory or path to header file) [auto]:

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

    r24452 r24454  
    33
    44
    5 ## Constants
     5# Constants
    66#
    7 VER="6.0.0"
     7VER="5.1.1"
    88
    99# Download source
    … …  
    2121rm -rf gmt-$VER
    2222
    23 # Copy custom configuration files
    24 cp ./configs/Linux/cmake/ConfigUser.cmake ./src/cmake
     23# Copy source customizations
     24cp configs/5.1/linux/cmake/ConfigUser.cmake src/cmake
    2525
    2626# Configure
    … …  
    3030cmake ..
    3131
    32 # Compile and install
     32# Install
    3333if [ $# -eq 0 ]; then
    34         make
    3534        make install
    3635else
    37         make -j $1
    3836        make -j $1 install
    3937fi

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

    r24330 r24454  
    22set -eu
    33
     4
     5## Environment
     6#
     7CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
    48
    59## Constants
    … …  
    2226
    2327# Copy custom configuration files
    24 cp ./configs/Linux/cmake/ConfigUser.cmake ./src/cmake
     28cp ./configs/6.0/linux/cmake/ConfigUser.cmake ./src/cmake
    2529
    2630# Configure
    … …  
    2832mkdir build
    2933cd build
    30 cmake ..
     34
     35# NOTE: There is a CMake variable named CURL_ROOT in src/cmake/ConfigUser.cmake
     36#               that, ostensibly, allows for supplying the path to curl when it is in a
     37#               a non-standard location. That said, newer versions of CMake will
     38#               ignore said variable and instead try to find curl itself. Passing in
     39#               the two options below overrides this behavior.
     40cmake \
     41        -DCURL_LIBRARY="${CURL_ROOT}/lib" \
     42        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
     43        ..
    3144
    3245# Compile and install

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh

    r24428 r24454  
    2121#
    2222export CC=mpicc
    23 export CPPFLAGS="-I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
    24 export LDFLAGS="-L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib"
     23CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
     24HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
     25ZLIB_ROOT="${ISSM_DIR}/externalpackages/zlib/install"
    2526
    2627# Download source

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh

    r24428 r24454  
    1515#
    1616VER="4.7.2"
     17CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
    1718HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
    1819ZLIB_ROOT="${ISSM_DIR}/externalpackages/zlib/install"
    … …  
    2122#
    2223export CC=mpicc
    23 export CPPFLAGS="-I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
    24 export LDFLAGS="-L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib"
     24export CPPFLAGS="-I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include -I${CURL_ROOT}/include"
     25export LDFLAGS="-L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib -L${CURL_ROOT}/lib"
    2526
    2627# Download source

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh

    r24428 r24454  
    1414#
    1515VER="4.7.2"
     16CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
     17HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
    1618ZLIB_ROOT="${ISSM_DIR}/externalpackages/zlib/install"
    1719
    1820# Environment
    1921#
    20 export CPPFLAGS="-I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
    21 export LDFLAGS="-L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib"
     22export CPPFLAGS="-I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include -I${CURL_ROOT}/include"
     23export LDFLAGS="-L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib -L${CURL_ROOT}/lib"
    2224
    2325# Download source

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

    r24428 r24454  
    1414#
    1515VER="4.7.2"
     16CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
    1617HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
    1718ZLIB_ROOT="${ISSM_DIR}/externalpackages/zlib/install"
    … …  
    1920# Environment
    2021#
    21 export CPPFLAGS="-I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
    22 export LDFLAGS="-L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib"
     22export CPPFLAGS="-I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include -I${CURL_ROOT}/include"
     23export LDFLAGS="-L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib -L${CURL_ROOT}/lib"
    2324
    2425# Download source

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

    r24428 r24454  
    5252        zlib            install-1.2.sh
    5353        hdf5            install-1.10.sh
     54        curl            install-7.67.sh
    5455        netcdf          install-4.7.sh
    5556        proj            install-6.2.sh
    56         gdal            install-3.0-netcdf.sh
     57        gdal            install-3.0-python-netcdf.sh
    5758        gshhg           install.sh
    58         gmt                     install-6.0-linux.sh
     59        gmt                     install-5.1-linux.sh
    5960        gmsh            install.sh
    6061        shell2junit     install.sh
Note: See TracChangeset for help on using the changeset viewer.