Skip to content

Commit

Permalink
Updates installation scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
@ferreteleco
ferreteleco committed Jun 21, 2022
1 parent 89358c6 commit 3fceac2
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----"

Expand Down
2 changes: 1 addition & 1 deletion cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----"

Expand Down
2 changes: 1 addition & 1 deletion cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----"

Expand Down
16 changes: 8 additions & 8 deletions cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----"

Expand Down Expand Up @@ -45,28 +45,28 @@ 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 " "
echo " "
echo "4. Installing PROJ data"

ldconfig

projsync --system-directory --all

ldconfig

echo " "
Expand Down
2 changes: 1 addition & 1 deletion cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpp-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-armadillo.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-catch2.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----"

Expand Down
2 changes: 1 addition & 1 deletion cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-gdal.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----"

Expand Down
2 changes: 1 addition & 1 deletion ...code-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-geographiclib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----"

Expand Down
16 changes: 8 additions & 8 deletions cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-proj.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----"

Expand Down Expand Up @@ -45,28 +45,28 @@ 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 " "
echo " "
echo "4. Installing PROJ data"

ldconfig

projsync --system-directory --all

ldconfig

echo " "
Expand Down
2 changes: 1 addition & 1 deletion cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-pybind11.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpp-vscode-dockerfile/{{ cookiecutter.__devcontainer_folder }}/scripts/install-spdlog.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3fceac2

Please sign in to comment.