Merge pull request #947 from stephengtuggy/install_deps_0.9.x

Include Third-Party Dependencies In Installers - 0.9.x
vegastrike · Jan 1, 2025 · 7281b44 · 7281b44
2 parents 6b1336c + ed5dbb3
commit 7281b44
Show file tree

Hide file tree

Showing 12 changed files with 515 additions and 233 deletions.
diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml
@@ -16,26 +16,26 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - FROM:     'ubuntu:mantic'
+          - FROM:     'ubuntu:noble'
             COMPILER: 'gcc'
             OpenGL_GL_PREFERENCE: 'LEGACY'
             ENABLE_PIE: 'OFF'
-            allow_failure: true
-          - FROM:     'ubuntu:mantic'
+            allow_failure: false
+          - FROM:     'ubuntu:noble'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'LEGACY'
             ENABLE_PIE: 'OFF'
-            allow_failure: true
-          - FROM:     'ubuntu:mantic'
+            allow_failure: false
+          - FROM:     'ubuntu:noble'
             COMPILER: 'gcc'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
-            allow_failure: true
-          - FROM:     'ubuntu:mantic'
+            allow_failure: false
+          - FROM:     'ubuntu:noble'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
-            allow_failure: true
+            allow_failure: false
           - FROM:     'ubuntu:jammy'
             COMPILER: 'gcc'
             OpenGL_GL_PREFERENCE: 'GLVND'
@@ -46,27 +46,27 @@ jobs:
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             allow_failure: false
-          - FROM:     'ubuntu:focal'
-            COMPILER: 'gcc'
+          - FROM:     'linuxmintd/mint22-amd64'
+            COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             allow_failure: false
-          - FROM:     'ubuntu:focal'
+          - FROM:     'linuxmintd/mint21.3-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             allow_failure: false
-          - FROM:     'linuxmintd/mint21.1-amd64'
+          - FROM:     'linuxmintd/mint21.2-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
-            allow_failure: true
-          - FROM:     'linuxmintd/mint21-amd64'
+            allow_failure: false
+          - FROM:     'linuxmintd/mint21.1-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             allow_failure: false
-          - FROM:     'linuxmintd/mint20-amd64'
+          - FROM:     'linuxmintd/mint21-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
@@ -76,56 +76,36 @@ jobs:
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             allow_failure: false
-          - FROM:     'debian:bullseye'
+          - FROM:     'opensuse/leap:15.6'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'OFF'
-            allow_failure: false
-          - FROM:     'opensuse/leap:15.5'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'LEGACY'
             ENABLE_PIE: 'ON'
-            allow_failure: true
-          - FROM:     'opensuse/leap:15.5'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'ON'
-            allow_failure: true
-          - FROM:     'opensuse/leap:15.4'
+            allow_failure: false
+          - FROM:     'opensuse/leap:15.6'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             allow_failure: false
-          - FROM:     'fedora:40'
+          - FROM:     'fedora:41'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'LEGACY'
             ENABLE_PIE: 'ON'
-            allow_failure: true
-          - FROM:     'fedora:40'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'ON'
-            allow_failure: true
-          - FROM:     'fedora:39'
+            allow_failure: false
+          - FROM:     'fedora:41'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             allow_failure: false
-          - FROM:     'fedora:38'
+          - FROM:     'fedora:40'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             allow_failure: false
-          - FROM:     'rockylinux:9.3'
-            COMPILER: 'clang'
+          - FROM:     'rockylinux/rockylinux:9.5'
+            COMPILER: 'gcc'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             allow_failure: false
-          #- FROM:     'rockylinux:8.9'
-          #  COMPILER: 'clang'
-          #  OpenGL_GL_PREFERENCE: 'GLVND'
-          #  ENABLE_PIE: 'ON'
-          #  allow_failure: false
           #- FROM:     'manjarolinux/base'
           #  COMPILER: 'clang'
           #  OpenGL_GL_PREFERENCE: 'LEGACY'
@@ -149,7 +129,7 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
           submodules: false

diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - FROM:     'ubuntu:mantic'
+          - FROM:     'ubuntu:noble'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
@@ -30,81 +30,66 @@ jobs:
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             ARTIFACT_EXT: 'deb'
-          - FROM:     'ubuntu:focal'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'OFF'
-            ARTIFACT_EXT: 'deb'
           # Source tarballs only
-          - FROM:     'ubuntu:focal'
+          - FROM:     'ubuntu:jammy'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             ARTIFACT_EXT: 'tar.[xb]z*'
-          - FROM:     'linuxmintd/mint21.1-amd64'
+          - FROM:     'linuxmintd/mint22-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             ARTIFACT_EXT: 'deb'
-          - FROM:     'linuxmintd/mint21-amd64'
+          - FROM:     'linuxmintd/mint21.3-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             ARTIFACT_EXT: 'deb'
-          - FROM:     'linuxmintd/mint20-amd64'
+          - FROM:     'linuxmintd/mint21.2-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             ARTIFACT_EXT: 'deb'
-          - FROM:     'debian:bookworm'
+          - FROM:     'linuxmintd/mint21.1-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             ARTIFACT_EXT: 'deb'
-          - FROM:     'debian:bullseye'
+          - FROM:     'linuxmintd/mint21-amd64'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'OFF'
             ARTIFACT_EXT: 'deb'
-          - FROM:     'opensuse/leap:15.5'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'ON'
-            ARTIFACT_EXT: 'rpm'
-          - FROM:     'opensuse/leap:15.4'
+          - FROM:     'debian:bookworm'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'ON'
-            ARTIFACT_EXT: 'rpm'
-          - FROM:     'fedora:40'
+            ENABLE_PIE: 'OFF'
+            ARTIFACT_EXT: 'deb'
+          - FROM:     'opensuse/leap:15.6'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             ARTIFACT_EXT: 'rpm'
-          - FROM:     'fedora:39'
+          - FROM:     'fedora:41'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             ARTIFACT_EXT: 'rpm'
-          - FROM:     'fedora:38'
+          - FROM:     'fedora:40'
             COMPILER: 'clang'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             ARTIFACT_EXT: 'rpm'
-          - FROM:     'rockylinux:9.3'
-            COMPILER: 'clang'
+          - FROM:     'rockylinux/rockylinux:9.5'
+            COMPILER: 'gcc'
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             ARTIFACT_EXT: 'rpm'
-          #- FROM:     'rockylinux:8.9'
-          #  COMPILER: 'clang'
-          #  OpenGL_GL_PREFERENCE: 'GLVND'
-          #  ENABLE_PIE: 'ON'
-          #  ARTIFACT_EXT: 'rpm'
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
           submodules: false

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,7 +1,7 @@
 ##
 # CMakeLists.txt
 #
-# Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+# Copyright (C) 2001-2024 Daniel Horn, pyramid3d, Stephen G. Tuggy,
 # Benjamen R. Meyer, and other Vega Strike contributors
 #
 # https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -23,13 +23,13 @@
 #
 
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.16 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.21 FATAL_ERROR)
 
 INCLUDE(GNUInstallDirs)
 MESSAGE("Always using preferred method now to install doc files")
-INSTALL(FILES AUTHORS TYPE DOC RENAME AUTHORS.SF)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/../AUTHORS" TYPE DOC RENAME AUTHORS.GITHUB)
-INSTALL(FILES ChangeLog TYPE DOC)
+INSTALL(FILES AUTHORS TYPE DOC RENAME AUTHORS.SF COMPONENT docs)
+INSTALL(FILES "${PROJECT_SOURCE_DIR}/../AUTHORS" TYPE DOC RENAME AUTHORS.GITHUB COMPONENT docs)
+INSTALL(FILES ChangeLog TYPE DOC COMPONENT docs)
 
 ADD_SUBDIRECTORY(man)
 
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
@@ -1,7 +1,7 @@
 ##
 # CMakeLists.txt
 #
-# Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+# Copyright (C) 2001-2024 Daniel Horn, pyramid3d, Stephen G. Tuggy,
 # Benjamen R. Meyer, and other Vega Strike contributors
 #
 # https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -23,13 +23,13 @@
 #
 
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.16 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.21 FATAL_ERROR)
 
 IF (UNIX)
 	MESSAGE("Always using preferred method now to install man pages")
-	INSTALL(FILES vegastrike-engine.1 TYPE MAN)
-	INSTALL(FILES vegastrike-engine.1 TYPE MAN RENAME vegastrike.1)
-	INSTALL(FILES vsinstall.1 TYPE MAN)
-	INSTALL(FILES vslauncher.1 TYPE MAN)
-	INSTALL(FILES vegasettings.1 TYPE MAN)
+	INSTALL(FILES vegastrike-engine.1 TYPE MAN COMPONENT man)
+	INSTALL(FILES vegastrike-engine.1 TYPE MAN RENAME vegastrike.1 COMPONENT man)
+	INSTALL(FILES vsinstall.1 TYPE MAN COMPONENT man)
+	INSTALL(FILES vslauncher.1 TYPE MAN COMPONENT man)
+	INSTALL(FILES vegasettings.1 TYPE MAN COMPONENT man)
 ENDIF (UNIX)