From 38177031ead5d3298ac1ecfd491a02f55498f2af Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 13:16:13 -0700 Subject: [PATCH 01/13] .gitignore .editorconfig --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7f4b696 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.editorconfig From 8e3dd2f21144ef6d33ddb6f2de97a130e2f16394 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 13:17:01 -0700 Subject: [PATCH 02/13] script/bootstrap: Use default version of Boost on focal, buster, ulyana --- script/bootstrap | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 833160c..41305d9 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -25,7 +25,7 @@ set -e echo "------------------------------" -echo "--- bootstrap | 2021-08-01 ---" +echo "--- bootstrap | 2021-08-29 ---" echo "------------------------------" if [ -f /etc/os-release ] @@ -99,9 +99,9 @@ then libsdl1.2-dev \ libpostproc-dev \ freeglut3-dev \ - libboost-python1.67-dev \ - libboost-log1.67-dev \ - libboost-regex1.67-dev \ + libboost-python-dev \ + libboost-log-dev \ + libboost-regex-dev \ libxmu-dev \ clang \ lsb-release @@ -222,9 +222,9 @@ then libopengl0 \ libpostproc-dev \ freeglut3-dev \ - libboost-python1.67-dev \ - libboost-log1.67-dev \ - libboost-regex1.67-dev \ + libboost-python-dev \ + libboost-log-dev \ + libboost-regex-dev \ libxmu-dev \ clang \ lsb-release @@ -300,9 +300,9 @@ then libopengl0 \ libpostproc-dev \ freeglut3-dev \ - libboost-python1.67-dev \ - libboost-log1.67-dev \ - libboost-regex1.67-dev \ + libboost-python-dev \ + libboost-log-dev \ + libboost-regex-dev \ libxmu-dev \ clang \ lsb-release From 109a68ed34485a3b251ee64fb8b43604bb449e25 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 13:25:21 -0700 Subject: [PATCH 03/13] script/bootstrap: Install cmake from snap instead of apt, where needed --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 41305d9..a22e524 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -234,7 +234,6 @@ then apt-get -qy upgrade apt-get -qy install \ git \ - cmake \ build-essential \ python-dev \ libgl1-mesa-glx \ @@ -251,6 +250,7 @@ then libxmu-dev \ clang \ lsb-release + snap install cmake --classic elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ] then apt-get update From 92db11c9565153a344277f67fbfadf0976112b9b Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 13:37:17 -0700 Subject: [PATCH 04/13] script/bootstrap: (Bionic) Need to install snapd b4 we can install snaps --- script/bootstrap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index a22e524..a810616 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -249,7 +249,8 @@ then libboost-regex-dev \ libxmu-dev \ clang \ - lsb-release + lsb-release \ + snapd snap install cmake --classic elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ] then From dc373202c01c58b75f0fccc490c4ae0788cd4f92 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 13:50:50 -0700 Subject: [PATCH 05/13] script/bootstrap: Start snapd service before trying to use it --- script/bootstrap | 1 + 1 file changed, 1 insertion(+) diff --git a/script/bootstrap b/script/bootstrap index a810616..7b5d83d 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -251,6 +251,7 @@ then clang \ lsb-release \ snapd + systemctl start snapd.service snap install cmake --classic elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ] then From b7d730e7ac3ca5d7bd676d217dceef4a0240c158 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 13:56:43 -0700 Subject: [PATCH 06/13] Try a different way of starting the snapd service --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 7b5d83d..4f1be05 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -251,7 +251,7 @@ then clang \ lsb-release \ snapd - systemctl start snapd.service + service snapd start snap install cmake --classic elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ] then From 652f14369895e929acd26e52cc53db1c18d23fce Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 14:02:18 -0700 Subject: [PATCH 07/13] Another try --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 4f1be05..27e9aeb 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -251,7 +251,7 @@ then clang \ lsb-release \ snapd - service snapd start + service snapd.service start snap install cmake --classic elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ] then From 9e9c344fbe1eff65300ba8cf1de0129140b20d5c Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 15:27:51 -0700 Subject: [PATCH 08/13] Switch back to apt version of cmake, since snapd doesn't work in Docker --- script/bootstrap | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 27e9aeb..41305d9 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -234,6 +234,7 @@ then apt-get -qy upgrade apt-get -qy install \ git \ + cmake \ build-essential \ python-dev \ libgl1-mesa-glx \ @@ -249,10 +250,7 @@ then libboost-regex-dev \ libxmu-dev \ clang \ - lsb-release \ - snapd - service snapd.service start - snap install cmake --classic + lsb-release elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ] then apt-get update From 4101ff80825fd571c40a21fdc867941a67012d73 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 15:28:25 -0700 Subject: [PATCH 09/13] script/bootstrap: Omit py2 on several distros --- script/bootstrap | 3 --- 1 file changed, 3 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 41305d9..867bf7a 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -310,7 +310,6 @@ elif [ $LINUX_ID == "opensuse-leap" ] && ([ $(echo ${LINUX_VERSION_ID} | cut -f then zypper --non-interactive install -y \ libboost_log1_66_0-devel \ - libboost_python-py2_7-1_66_0-devel \ libboost_python-py3-1_66_0-devel \ libboost_system1_66_0-devel \ libboost_filesystem1_66_0-devel \ @@ -383,7 +382,6 @@ then git \ cmake \ boost-devel \ - boost-python2-devel \ boost-python3-devel \ freeglut-devel \ gcc-c++ \ @@ -394,7 +392,6 @@ then libpng-devel \ expat-devel \ gtk3-devel \ - python2-devel \ python3-devel \ rpm-build \ make \ From 8e7d1afbace601a5708081a9dba040ac04441d44 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 15:30:31 -0700 Subject: [PATCH 10/13] script/cibuild, script/bootstrap: Update file headers --- script/bootstrap | 4 ++-- script/cibuild | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 867bf7a..14471c5 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -1,11 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash #==================================== # @file : bootstrap # @brief : installs dependencies for building Vega Strike # @usage : sudo script/bootstrap # @param : none #==================================== -# Copyright (C) 2020-2021 Stephen G. Tuggy +# Copyright (C) 2020-2021 Stephen G. Tuggy # # This file is part of Vega Strike. # diff --git a/script/cibuild b/script/cibuild index 67536a2..cbcff9c 100755 --- a/script/cibuild +++ b/script/cibuild @@ -1,12 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash #==================================== # @file : cibuild -# @brief : Builds the docker images -# in the context of CI/CD (Travis) +# @brief : Builds the docker images in the context of CI/CD (GitHub Actions) # @usage : script/cibuild # @param : none #==================================== -# Copyright (C) 2020 Stephen G. Tuggy +# Copyright (C) 2020-2021 Stephen G. Tuggy # # This file is part of Vega Strike. # From 0ae15b1520b4ecae3673280f75110f45e3402d70 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 16:44:36 -0700 Subject: [PATCH 11/13] script/bootstrap: Omit remaining py2 packages --- script/bootstrap | 7 ------- 1 file changed, 7 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 14471c5..a235210 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -82,7 +82,6 @@ then apt-get -qy install \ git \ cmake \ - python-dev \ build-essential \ automake \ autoconf \ @@ -112,7 +111,6 @@ then apt-get -qy install \ git \ cmake \ - python-dev \ build-essential \ automake \ autoconf \ @@ -204,7 +202,6 @@ then apt-get -qy install \ git \ cmake \ - python-dev \ build-essential \ automake \ autoconf \ @@ -236,7 +233,6 @@ then git \ cmake \ build-essential \ - python-dev \ libgl1-mesa-glx \ freeglut3-dev \ libopenal-dev \ @@ -259,7 +255,6 @@ then git \ cmake \ build-essential \ - python-dev \ libgl1-mesa-glx \ freeglut3-dev \ libopenal-dev \ @@ -282,7 +277,6 @@ then apt-get -qy install \ git \ cmake \ - python-dev \ build-essential \ automake \ autoconf \ @@ -332,7 +326,6 @@ then libexpat-devel \ libgtk-3-0 \ gtk3-devel \ - python-devel \ python3-devel \ git \ rpm-build \ From cea1f71eddc35c8b5e7b3e93f79876fc43c98374 Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Sun, 29 Aug 2021 17:09:37 -0700 Subject: [PATCH 12/13] script/bootstrap: Edit rocky version detection logic to match openSUSE's --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index a235210..6564cba 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -435,7 +435,7 @@ then rpm-build \ make \ clang -elif [ $LINUX_ID == "rocky" ] && [ $LINUX_VERSION_ID == "8.4" ] +elif [ $LINUX_ID == "rocky" ] && ([ $(echo ${LINUX_VERSION_ID} | cut -f 1 -d '.') -eq 8 ] && [ $(echo ${LINUX_VERSION_ID} | cut -f 2 -d '.') -ge 4 ]) then dnf -y install dnf-plugins-core dnf -y install epel-release From ef9bf748f8f2fbd728af05172413978b1a81f93f Mon Sep 17 00:00:00 2001 From: Stephen G Tuggy Date: Mon, 30 Aug 2021 13:29:25 -0700 Subject: [PATCH 13/13] script/bootstrap: Install cmake using pip, on bionic specifically --- script/bootstrap | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 6564cba..a50ed78 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -231,7 +231,6 @@ then apt-get -qy upgrade apt-get -qy install \ git \ - cmake \ build-essential \ libgl1-mesa-glx \ freeglut3-dev \ @@ -246,7 +245,9 @@ then libboost-regex-dev \ libxmu-dev \ clang \ - lsb-release + lsb-release \ + python3-pip + pip3 install --upgrade-strategy eager cmake elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "xenial" ] then apt-get update