From 3fceac24c9521b0a907e520355b802bf93de10c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Ferreiro=20Gonz=C3=A1lez?= Date: Tue, 21 Jun 2022 18:57:46 +0200 Subject: [PATCH] Updates installation scripts --- .../scripts/install-armadillo.sh | 2 +- .../scripts/install-catch2.sh | 2 +- .../scripts/install-gdal.sh | 2 +- .../scripts/install-geographiclib.sh | 2 +- .../scripts/install-proj.sh | 16 ++++++++-------- .../scripts/install-pybind11.sh | 2 +- .../scripts/install-spdlog.sh | 2 +- .../scripts/install-armadillo.sh | 2 +- .../scripts/install-catch2.sh | 2 +- .../scripts/install-gdal.sh | 2 +- .../scripts/install-geographiclib.sh | 2 +- .../scripts/install-proj.sh | 16 ++++++++-------- .../scripts/install-pybind11.sh | 2 +- .../scripts/install-spdlog.sh | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh index 6f1e0ed..9841155 100644 --- a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh +++ b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -ARMADILLO=10.8.2 +ARMADILLO=11.2.0 echo "---- Armadillo v${ARMADILLO} Installation Script ----" if ! [ $(id -u) = 0 ]; then diff --git a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh index 9a76db6..55e3f9d 100644 --- a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh +++ b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -CATCH2=3.0.0-preview3 +CATCH2=3.0.1 echo "---- Catch2 v${CATCH2} Installation Script ----" diff --git a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh index a462278..6037e02 100644 --- a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh +++ b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -GDAL_VERSION=3.4.1 +GDAL_VERSION=3.5.0 echo "---- GDAL v${GDAL_VERSION} Installation Script ----" diff --git a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh index 858c597..96928b6 100644 --- a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh +++ b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -GEOGRAPHICLIB_VERSION=1.52 +GEOGRAPHICLIB_VERSION=2.1 echo "---- GeographicLib v${GEOGRAPHICLIB_VERSION} Installation Script ----" diff --git a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh index 2553e24..d4490db 100644 --- a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh +++ b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -PROJ_VERSION=7.2.1 +PROJ_VERSION=9.0.1 echo "---- PROJ Installation Script ----" @@ -45,20 +45,18 @@ echo " " echo " " echo "2. Building PROJ v${PROJ_VERSION}" -./configure +mkdir build +cd build -np=$(nproc) -jobs=$((np / 2)) -jobs=$( (($jobs <= 1)) && echo "1" || echo "$jobs") - -make -j ${jobs} +cmake .. +cmake --build . echo " " echo " " echo " " echo "3. Installing PROJ v${PROJ_VERSION}" -make install +cmake --build . --target install echo " " echo " " @@ -66,7 +64,9 @@ echo " " echo "4. Installing PROJ data" ldconfig + projsync --system-directory --all + ldconfig echo " " diff --git a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh index 3e7b779..930f68f 100644 --- a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh +++ b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -PYBIND11_VERSION=2.9.1 +PYBIND11_VERSION=2.9.2 echo "---- pybind11 v${PYBIND11_VERSION} Installation Script ----" if ! [ $(id -u) = 0 ]; then diff --git a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh index 6d9d946..97ec843 100644 --- a/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh +++ b/cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -SPDLOG=1.9.2 +SPDLOG=1.10.0 echo "---- SPDLOG v${SPDLOG} Installation Script ----" if ! [ $(id -u) = 0 ]; then echo "The script need to be run as root." >&2 diff --git a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh index 6f1e0ed..9841155 100644 --- a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh +++ b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -ARMADILLO=10.8.2 +ARMADILLO=11.2.0 echo "---- Armadillo v${ARMADILLO} Installation Script ----" if ! [ $(id -u) = 0 ]; then diff --git a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh index 9a76db6..55e3f9d 100644 --- a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh +++ b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -CATCH2=3.0.0-preview3 +CATCH2=3.0.1 echo "---- Catch2 v${CATCH2} Installation Script ----" diff --git a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh index a462278..6037e02 100644 --- a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh +++ b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -GDAL_VERSION=3.4.1 +GDAL_VERSION=3.5.0 echo "---- GDAL v${GDAL_VERSION} Installation Script ----" diff --git a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh index 858c597..96928b6 100644 --- a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh +++ b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -GEOGRAPHICLIB_VERSION=1.52 +GEOGRAPHICLIB_VERSION=2.1 echo "---- GeographicLib v${GEOGRAPHICLIB_VERSION} Installation Script ----" diff --git a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh index 2553e24..d4490db 100644 --- a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh +++ b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -PROJ_VERSION=7.2.1 +PROJ_VERSION=9.0.1 echo "---- PROJ Installation Script ----" @@ -45,20 +45,18 @@ echo " " echo " " echo "2. Building PROJ v${PROJ_VERSION}" -./configure +mkdir build +cd build -np=$(nproc) -jobs=$((np / 2)) -jobs=$( (($jobs <= 1)) && echo "1" || echo "$jobs") - -make -j ${jobs} +cmake .. +cmake --build . echo " " echo " " echo " " echo "3. Installing PROJ v${PROJ_VERSION}" -make install +cmake --build . --target install echo " " echo " " @@ -66,7 +64,9 @@ echo " " echo "4. Installing PROJ data" ldconfig + projsync --system-directory --all + ldconfig echo " " diff --git a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh index 3e7b779..930f68f 100644 --- a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh +++ b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -PYBIND11_VERSION=2.9.1 +PYBIND11_VERSION=2.9.2 echo "---- pybind11 v${PYBIND11_VERSION} Installation Script ----" if ! [ $(id -u) = 0 ]; then diff --git a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh index 6d9d946..97ec843 100644 --- a/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh +++ b/cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh @@ -6,7 +6,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -SPDLOG=1.9.2 +SPDLOG=1.10.0 echo "---- SPDLOG v${SPDLOG} Installation Script ----" if ! [ $(id -u) = 0 ]; then echo "The script need to be run as root." >&2