Changeset 26752

Timestamp:

12/28/21 15:09:04 (3 years ago)

Author:

jdquinn

Message:

BUG: Need to use PROJ 6

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/proj/install-6 static.sh (copied) (copied from issm/trunk-jpl/externalpackages/proj/install-6.sh ) (2 diffs)
• externalpackages/proj/install-6.sh (modified) (1 diff)
• externalpackages/proj/install-8-static-with_tests.sh (modified) (1 diff)
• externalpackages/proj/install-8-static.sh (modified) (1 diff)
• externalpackages/proj/install-8-with_tests.sh (modified) (1 diff)
• externalpackages/proj/install-8.sh (modified) (1 diff)
• jenkins/aws-amazon_linux-solid_earth (modified) (1 diff)
• jenkins/pine_island-mac-binaries-matlab (modified) (1 diff)
• jenkins/pine_island-mac-binaries-python (modified) (1 diff)
• jenkins/pine_island-mac-full (modified) (1 diff)
• jenkins/pine_island-mac-full-valgrind (modified) (1 diff)
• jenkins/pine_island-mac-python (modified) (1 diff)
• jenkins/pleiades-dakota (added)
• jenkins/ross-debian_linux-binaries-matlab (modified) (1 diff)
• jenkins/ross-debian_linux-binaries-python (modified) (1 diff)
• jenkins/ross-debian_linux-dakota (modified) (1 diff)
• jenkins/ross-debian_linux-full (modified) (1 diff)
• jenkins/ross-debian_linux-full-valgrind (modified) (1 diff)
• jenkins/ross-debian_linux-python (modified) (1 diff)
• jenkins/ross-debian_linux-solid_earth (modified) (1 diff)
• jenkins/ross-win-msys2-mingw-msmpi-basic (modified) (2 diffs)

issm/trunk-jpl/etc/environment.sh

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

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

@@ -13 +13 @@
 export CC=mpicc
 export CXX=mpicxx
+
 # NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
-#               requires,
+# requires,
 #
-#                       SQLITE3_LIBS="-lsqlite3".
+#       SQLITE3_LIBS="-lsqlite3".
 #
-#               On Ubuntu Linux, install the SQLite3 binary, libraries and headers
-#               with,
+# On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#                       `apt-get install sqlite3 libsqlite3-dev`
+#       apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"
@@ -45 +45 @@
         --disable-dependency-tracking \
         --enable-fast-install \
+        --disable-shared \
         --disable-tiff
 

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

@@ -13 +13 @@
 export CC=mpicc
 export CXX=mpicxx
+
 # NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
-#               requires,
+# requires,
 #
-#                       SQLITE3_LIBS="-lsqlite3".
+#       SQLITE3_LIBS="-lsqlite3".
 #
-#               On Ubuntu Linux, install the SQLite3 binary, libraries and headers
-#               with,
+# On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#                       `apt-get install sqlite3 libsqlite3-dev`
+#       apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"

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

@@ -21 +21 @@
 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#       `apt-get install sqlite3 libsqlite3-dev`
+#       apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"

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

@@ -21 +21 @@
 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#       `apt-get install sqlite3 libsqlite3-dev`
+#       apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"

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

@@ -21 +21 @@
 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#       `apt-get install sqlite3 libsqlite3-dev`
+#       apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"

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

@@ -21 +21 @@
 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#       `apt-get install sqlite3 libsqlite3-dev`
+#       apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"

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

@@ -42 +42 @@
         curl                    install-7-linux.sh
         netcdf                  install-4.7-parallel.sh
-        proj                    install-8.sh
+        proj                    install-6.sh
         gdal                    install-3-python.sh
         gshhg                   install.sh

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

@@ -52 +52 @@
         curl            install-7-mac-static.sh
         netcdf          install-4.7-parallel-static.sh
-        proj            install-8-static.sh
+        proj            install-6-static.sh
         gdal            install-3-static.sh
         gshhg           install.sh

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

@@ -50 +50 @@
         curl            install-7-mac-static.sh
         netcdf          install-4.7-parallel-static.sh
-        proj            install-8-static.sh
+        proj            install-6-static.sh
         gdal            install-3-python-static.sh
         gshhg           install.sh

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

@@ -50 +50 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-8.sh
+        proj            install-6.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -50 +50 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-8.sh
+        proj            install-6.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -45 +45 @@
         curl            install-7-mac.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-8.sh
+        proj            install-6.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -50 +50 @@
         curl            install-7-linux-static.sh
         netcdf          install-4.7-parallel-static.sh
-        proj            install-8-static.sh
+        proj            install-6-static.sh
         gdal            install-3-static.sh
         gshhg           install.sh

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

@@ -50 +50 @@
         curl            install-7-linux-static.sh
         netcdf          install-4.7-parallel-static.sh
-        proj            install-8-static.sh
+        proj            install-6-static.sh
         gdal            install-3-python-static.sh
         gshhg           install.sh

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

@@ -49 +49 @@
         curl                    install-7-linux.sh
         netcdf                  install-4.7-parallel.sh
-        proj                    install-8.sh
+        proj                    install-6.sh
         gdal                    install-3-python.sh
         gshhg                   install.sh

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

@@ -50 +50 @@
         curl            install-7-linux.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-8.sh
+        proj            install-6.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -50 +50 @@
         curl            install-7-linux.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-8.sh
+        proj            install-6.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -44 +44 @@
         curl            install-7-linux.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-8.sh
+        proj            install-6.sh
         gdal            install-3-python.sh
         gshhg           install.sh

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

@@ -47 +47 @@
         curl                    install-7-linux.sh
         netcdf                  install-4.7-parallel.sh
-        proj                    install-8.sh
+        proj                    install-6.sh
         gdal                    install-3-python.sh
         gshhg                   install.sh

issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic

@@ -7 +7 @@
         --with-numthreads=4 \
         --with-vendor="win-msys2" \
-        --with-matlab-dir=${MATLAB_PATH} \
+        --with-matlab-dir="${MATLAB_PATH}" \
         --with-mpi-include="${MSMPI_ROOT}/include" \
         --with-mpi-libdir="${MSMPI_ROOT}/lib" \
@@ -15 +15 @@
         --with-parmetis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
         --with-blas-lapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
-        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-scalapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \
         --with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \
         --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install" \
-        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
-        --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
-        --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
+        --with-chaco-dir="${ISSM_DIR}/externalpackages/chaco/install" \
+        --with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" \
+        --with-semic-dir="${ISSM_DIR}/externalpackages/semic/install" \
 '