Changeset 26369

Timestamp:

07/30/21 00:24:39 (4 years ago)

Author:

jdquinn

Message:

CHG: Cleanup following switch to PROJ 8

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/libtiff (added)
• externalpackages/libtiff/install-4-mac.sh (added)
• externalpackages/proj/install-6.2.sh (deleted)
• externalpackages/proj/install-8-static-with_tests.sh (moved) (moved from issm/trunk-jpl/externalpackages/proj/install-6.2-static-with_tests.sh ) (3 diffs)
• externalpackages/proj/install-8-static.sh (moved) (moved from issm/trunk-jpl/externalpackages/proj/install-6.2-static.sh ) (3 diffs)
• externalpackages/proj/install-8-with_tests.sh (moved) (moved from issm/trunk-jpl/externalpackages/proj/install-6.2-with_tests.sh ) (3 diffs)
• externalpackages/proj/install-8.sh (modified) (1 diff)
• jenkins/aws-amazon_linux-solid_earth (modified) (2 diffs)
• jenkins/pine_island-mac-binaries-matlab (modified) (2 diffs)
• jenkins/pine_island-mac-binaries-python (modified) (2 diffs)
• jenkins/pine_island-mac-dakota (modified) (2 diffs)
• jenkins/pine_island-mac-examples (modified) (2 diffs)
• jenkins/pine_island-mac-full (modified) (2 diffs)
• jenkins/pine_island-mac-full-valgrind (modified) (2 diffs)
• jenkins/pine_island-mac-python (modified) (2 diffs)
• jenkins/pine_island-mac-solid_earth (modified) (2 diffs)
• jenkins/pine_island-mac-solid_earth-lambert (modified) (2 diffs)
• jenkins/ross-debian_linux-binaries-matlab (modified) (2 diffs)
• jenkins/ross-debian_linux-binaries-python (modified) (2 diffs)
• jenkins/ross-debian_linux-dakota (modified) (2 diffs)
• jenkins/ross-debian_linux-full (modified) (2 diffs)
• jenkins/ross-debian_linux-full-valgrind (modified) (2 diffs)
• jenkins/ross-debian_linux-python (modified) (2 diffs)
• jenkins/ross-debian_linux-solid_earth (modified) (2 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -504 +504 @@
 fi
 
+LIBTIFF_ROOT="${ISSM_EXT_SHARED_DIR}/libtiff/install"
+if [ -d "${LIBTIFF_ROOT}" ]; then
+        dyld_library_path_append "${LIBTIFF_ROOT}/install/libtiff"
+        ld_library_path_append "${LIBTIFF_ROOT}/install/libtiff"
+fi
+
 PROJ_ROOT="${ISSM_EXT_DIR}/proj/install"
 if [ -d "${PROJ_ROOT}" ]; then

issm/trunk-jpl/externalpackages/proj/install-8-static-with_tests.sh

@@ -5 +5 @@
 # Constants
 #
-VER="6.2.1"
+VER="8.1.0"
 
 PREFIX="${ISSM_DIR}/externalpackages/proj/install" # Set to location where external package should be installed
@@ -13 +13 @@
 export CC=mpicc
 export CXX=mpicxx
-# NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
-#               requires,
-#
-#                       SQLITE3_LIBS="-lsqlite3".
-#
-#               On Ubuntu Linux, install the SQLite3 binary, libraries and headers
-#               with,
-#
-#                       `apt-get install sqlite3 libsqlite3-dev`
-#
-export SQLITE3_LIBS="-lsqlite3"
 
 # Cleanup
@@ -45 +34 @@
         --disable-dependency-tracking \
         --enable-fast-install \
-        --disable-shared
+        --disable-shared \
+        --disable-libtiff
 
 # Compile and install

issm/trunk-jpl/externalpackages/proj/install-8-static.sh

@@ -5 +5 @@
 # Constants
 #
-VER="6.2.1"
+VER="8.1.0"
 
 PREFIX="${ISSM_DIR}/externalpackages/proj/install" # Set to location where external package should be installed
@@ -13 +13 @@
 export CC=mpicc
 export CXX=mpicxx
-# NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
-#               requires,
-#
-#                       SQLITE3_LIBS="-lsqlite3".
-#
-#               On Ubuntu Linux, install the SQLite3 binary, libraries and headers
-#               with,
-#
-#                       `apt-get install sqlite3 libsqlite3-dev`
-#
-export SQLITE3_LIBS="-lsqlite3"
 
 # Cleanup
@@ -45 +34 @@
         --disable-dependency-tracking \
         --enable-fast-install \
-        --disable-shared
+        --disable-shared \
+        --disable-libtiff
 
 # Compile and install

issm/trunk-jpl/externalpackages/proj/install-8-with_tests.sh

@@ -5 +5 @@
 # Constants
 #
-VER="6.2.1"
+VER="8.1.0"
 
 PREFIX="${ISSM_DIR}/externalpackages/proj/install" # Set to location where external package should be installed
@@ -13 +13 @@
 export CC=mpicc
 export CXX=mpicxx
-# NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
-#               requires,
-#
-#                       SQLITE3_LIBS="-lsqlite3".
-#
-#               On Ubuntu Linux, install the SQLite3 binary, libraries and headers
-#               with,
-#
-#                       `apt-get install sqlite3 libsqlite3-dev`
-#
-export SQLITE3_LIBS="-lsqlite3"
 
 # Cleanup
@@ -44 +33 @@
         --prefix="${PREFIX}" \
         --disable-dependency-tracking \
-        --enable-fast-install
+        --enable-fast-install \
+        --disable-libtiff
 
 # Compile and install

issm/trunk-jpl/externalpackages/proj/install-8.sh

@@ -33 +33 @@
         --prefix="${PREFIX}" \
         --disable-dependency-tracking \
-        --enable-fast-install
+        --enable-fast-install \
+        --disable-libtiff
 
 # Compile and install

issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth

@@ -22 +22 @@
         --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
-        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install
+        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
+        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install
 '
 
@@ -41 +42 @@
         curl                    install-7-linux.sh
         netcdf                  install-4.7-parallel.sh
-        proj                    install-6.2.sh
+        proj                    install-8.sh
         gdal                    install-3-python.sh
         gshhg                   install.sh

issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab

@@ -32 +32 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -51 +52 @@
         curl            install-7-mac-static.sh
         netcdf          install-4.7-parallel-static.sh
-        proj            install-6.2-static.sh
+        proj            install-8-static.sh
         gdal            install-3-static.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-binaries-python

@@ -30 +30 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -49 +50 @@
         curl            install-7-mac-static.sh
         netcdf          install-4.7-parallel-static.sh
-        proj            install-6.2-static.sh
+        proj            install-8-static.sh
         gdal            install-3-python-static.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-dakota

@@ -27 +27 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -47 +48 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-examples

@@ -29 +29 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -48 +49 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-full

@@ -30 +30 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -49 +50 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-full-valgrind

@@ -30 +30 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -49 +50 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-python

@@ -24 +24 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -44 +45 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-solid_earth

@@ -27 +27 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -47 +48 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-solid_earth-lambert

@@ -27 +27 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -47 +48 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -31 +31 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -49 +50 @@
         curl            install-7-linux-static.sh
         netcdf          install-4.7-parallel-static.sh
-        proj            install-6.2-static.sh
+        proj            install-8-static.sh
         gdal            install-3-static.sh
         gshhg           install.sh

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

@@ -31 +31 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -49 +50 @@
         curl            install-7-linux-static.sh
         netcdf          install-4.7-parallel-static.sh
-        proj            install-6.2-static.sh
+        proj            install-8-static.sh
         gdal            install-3-python-static.sh
         gshhg           install.sh

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

@@ -29 +29 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -48 +49 @@
         curl                    install-7-linux.sh
         netcdf                  install-4.7-parallel.sh
-        proj                    install-6.2.sh
+        proj                    install-8.sh
         gdal                    install-3-python.sh
         gshhg                   install.sh

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

@@ -30 +30 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -49 +50 @@
         curl            install-7-linux.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -30 +30 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -49 +50 @@
         curl            install-7-linux.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

issm/trunk-jpl/jenkins/ross-debian_linux-python

@@ -24 +24 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -43 +44 @@
         curl            install-7-linux.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
+        proj            install-8.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -27 +27 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -46 +47 @@
         curl                    install-7-linux.sh
         netcdf                  install-4.7-parallel.sh
-        proj                    install-6.2.sh
+        proj                    install-8.sh
         gdal                    install-3-python.sh
         gshhg                   install.sh