From ddc6e0ac80016bd1059a80b129ca0ac0bd9e18dc Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 1 Mar 2024 13:57:02 -0600 Subject: [PATCH] engines - Switch more to env.json with COMMIT_TAG, based on tag values --- engines/classic-rbdoom-3-bfg/build.sh | 2 +- engines/classic-rbdoom-3-bfg/env.json | 18 ++++++++++++++++++ engines/classic-rbdoom-3-bfg/env.sh | 7 ------- engines/engge/build.sh | 2 +- engines/engge/env.json | 10 ++++++++++ engines/engge/env.sh | 5 ----- engines/ezquake/build.sh | 2 +- engines/ezquake/env.json | 11 +++++++++++ engines/ezquake/env.sh | 6 ------ engines/hiigara/build.sh | 2 +- engines/hiigara/env.json | 7 +++++++ engines/hiigara/env.sh | 4 ---- engines/open-ig/build.sh | 2 +- engines/open-ig/env.json | 13 +++++++++++++ engines/open-ig/env.sh | 6 ------ engines/openapoc/build.sh | 2 +- engines/openapoc/env.json | 13 +++++++++++++ engines/openapoc/env.sh | 6 ------ engines/opengothic/build.sh | 2 +- engines/opengothic/env.json | 8 ++++++++ engines/opengothic/env.sh | 4 ---- 21 files changed, 87 insertions(+), 45 deletions(-) create mode 100644 engines/classic-rbdoom-3-bfg/env.json delete mode 100755 engines/classic-rbdoom-3-bfg/env.sh create mode 100644 engines/engge/env.json delete mode 100755 engines/engge/env.sh create mode 100644 engines/ezquake/env.json delete mode 100755 engines/ezquake/env.sh create mode 100644 engines/hiigara/env.json delete mode 100755 engines/hiigara/env.sh create mode 100644 engines/open-ig/env.json delete mode 100755 engines/open-ig/env.sh create mode 100644 engines/openapoc/env.json delete mode 100755 engines/openapoc/env.sh create mode 100644 engines/opengothic/env.json delete mode 100755 engines/opengothic/env.sh diff --git a/engines/classic-rbdoom-3-bfg/build.sh b/engines/classic-rbdoom-3-bfg/build.sh index 42a12e664..8e092491e 100755 --- a/engines/classic-rbdoom-3-bfg/build.sh +++ b/engines/classic-rbdoom-3-bfg/build.sh @@ -3,7 +3,7 @@ # CLONE PHASE git clone https://github.com/MadDeCoDeR/Classic-RBDOOM-3-BFG.git source pushd source -git checkout 710cc70 +git checkout "$COMMIT_TAG" git submodule update --init --recursive popd diff --git a/engines/classic-rbdoom-3-bfg/env.json b/engines/classic-rbdoom-3-bfg/env.json new file mode 100644 index 000000000..330175199 --- /dev/null +++ b/engines/classic-rbdoom-3-bfg/env.json @@ -0,0 +1,18 @@ +{ + "STEAM_APP_ID_LIST": [ + "208200", + "1898710" + ], + "LICENSE_PATH": "./source/COPYING.txt", + "ADDITIONAL_LICENSES": [ + "./source/README.md", + "./source/neo/libs/open-platform/COPYING.txt", + "./licenses/*" + ], + "APT_LIBRARIES": [ + "yasm", + "nasm" + ], + "GCC_12": true, + "COMMIT_TAG": "nightly-2023-08-09-18-51-1691607119" +} \ No newline at end of file diff --git a/engines/classic-rbdoom-3-bfg/env.sh b/engines/classic-rbdoom-3-bfg/env.sh deleted file mode 100755 index b1c9839e8..000000000 --- a/engines/classic-rbdoom-3-bfg/env.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -export STEAM_APP_ID_LIST="208200 1898710" -export LICENSE_PATH="./source/COPYING.txt" -export ADDITIONAL_LICENSES="./source/README.md ./source/neo/libs/open-platform/COPYING.txt ./licenses/*" -export APT_LIBRARIES="yasm nasm" -export GCC_12="1" diff --git a/engines/engge/build.sh b/engines/engge/build.sh index ecd4a42aa..fb057c214 100755 --- a/engines/engge/build.sh +++ b/engines/engge/build.sh @@ -3,7 +3,7 @@ # CLONE PHASE git clone https://github.com/scemino/engge.git source pushd source -git checkout 5e607bc +git checkout "$COMMIT_TAG" git submodule update --init --recursive popd diff --git a/engines/engge/env.json b/engines/engge/env.json new file mode 100644 index 000000000..248b32ee5 --- /dev/null +++ b/engines/engge/env.json @@ -0,0 +1,10 @@ +{ + "STEAM_APP_ID_LIST": [ + "569860" + ], + "LICENSE_PATH": "./source/LICENSE", + "APT_LIBRARIES": [ + "libglm-dev" + ], + "COMMIT_TAG": "v0.8.0-beta" +} \ No newline at end of file diff --git a/engines/engge/env.sh b/engines/engge/env.sh deleted file mode 100755 index 09ee94c35..000000000 --- a/engines/engge/env.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -export STEAM_APP_ID_LIST="569860" -export LICENSE_PATH="./source/LICENSE" -export APT_LIBRARIES="libglm-dev" diff --git a/engines/ezquake/build.sh b/engines/ezquake/build.sh index 655676f25..b967e6f67 100755 --- a/engines/ezquake/build.sh +++ b/engines/ezquake/build.sh @@ -3,7 +3,7 @@ # CLONE PHASE git clone https://github.com/ezQuake/ezquake-source.git source pushd source -git checkout e7ecc1f +git checkout "$COMMIT_TAG" popd # BUILD PHASE diff --git a/engines/ezquake/env.json b/engines/ezquake/env.json new file mode 100644 index 000000000..c66c06b9f --- /dev/null +++ b/engines/ezquake/env.json @@ -0,0 +1,11 @@ +{ + "STEAM_APP_ID_LIST": [ + "2310" + ], + "LICENSE_PATH": "./source/LICENSE", + "ADDITIONAL_LICENSES": [ + "./LICENSE" + ], + "COMMON_PACKAGE": true, + "COMMIT_TAG": "3.2.3" +} \ No newline at end of file diff --git a/engines/ezquake/env.sh b/engines/ezquake/env.sh deleted file mode 100755 index 30d2c4c75..000000000 --- a/engines/ezquake/env.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -export STEAM_APP_ID_LIST="2310" -export LICENSE_PATH="./source/LICENSE" -export ADDITIONAL_LICENSES="./LICENSE" -export COMMON_PACKAGE="1" diff --git a/engines/hiigara/build.sh b/engines/hiigara/build.sh index 8ec91f6e7..398e52c7f 100755 --- a/engines/hiigara/build.sh +++ b/engines/hiigara/build.sh @@ -3,7 +3,7 @@ # CLONE PHASE git clone https://github.com/atsb/Hiigara.git source pushd source -git checkout 5fca0d2 +git checkout "$COMMIT_TAG" popd # BUILD PHASE diff --git a/engines/hiigara/env.json b/engines/hiigara/env.json new file mode 100644 index 000000000..8e230fcf9 --- /dev/null +++ b/engines/hiigara/env.json @@ -0,0 +1,7 @@ +{ + "STEAM_APP_ID_LIST": [ + "244160" + ], + "LICENSE_PATH": "./source/LICENSE.txt", + "COMMIT_TAG": "000" +} \ No newline at end of file diff --git a/engines/hiigara/env.sh b/engines/hiigara/env.sh deleted file mode 100755 index 271ce6923..000000000 --- a/engines/hiigara/env.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -export STEAM_APP_ID_LIST="244160" -export LICENSE_PATH="./source/LICENSE.txt" diff --git a/engines/open-ig/build.sh b/engines/open-ig/build.sh index 0cd53342e..4ab7afd9e 100755 --- a/engines/open-ig/build.sh +++ b/engines/open-ig/build.sh @@ -3,7 +3,7 @@ # CLONE PHASE git clone https://github.com/akarnokd/open-ig.git source pushd source -git checkout 8f58a81 +git checkout "$COMMIT_TAG" popd # COPY PHASE diff --git a/engines/open-ig/env.json b/engines/open-ig/env.json new file mode 100644 index 000000000..5a13ff199 --- /dev/null +++ b/engines/open-ig/env.json @@ -0,0 +1,13 @@ +{ + "STEAM_APP_ID_LIST": [ + "573790" + ], + "LICENSE_PATH": "./source/LICENSE.txt", + "ADDITIONAL_LICENSES": [ + "./source/IMAGE_CREDITS.txt" + ], + "LIBRARIES": [ + "openjdk11" + ], + "COMMIT_TAG": "v0.95.237" +} \ No newline at end of file diff --git a/engines/open-ig/env.sh b/engines/open-ig/env.sh deleted file mode 100755 index 7e0cf1b54..000000000 --- a/engines/open-ig/env.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -export STEAM_APP_ID_LIST="573790" -export LICENSE_PATH="./source/LICENSE.txt" -export ADDITIONAL_LICENSES="./source/IMAGE_CREDITS.txt" -export LIBRARIES="openjdk11" diff --git a/engines/openapoc/build.sh b/engines/openapoc/build.sh index aa04ad5e2..fb4cf7886 100755 --- a/engines/openapoc/build.sh +++ b/engines/openapoc/build.sh @@ -6,7 +6,7 @@ export LD_LIBRARY_PATH="$VCPKG_INSTALLED_PATH/lib:$LD_LIBRARY_PATH" # CLONE PHASE git clone https://github.com/OpenApoc/OpenApoc.git source pushd source -git checkout -f a224501 +git checkout -f "$COMMIT_TAG" git submodule update --init --recursive popd diff --git a/engines/openapoc/env.json b/engines/openapoc/env.json new file mode 100644 index 000000000..0d8ca5702 --- /dev/null +++ b/engines/openapoc/env.json @@ -0,0 +1,13 @@ +{ + "STEAM_APP_ID_LIST": [ + "7660" + ], + "LICENSE_PATH": "./source/LICENSE", + "LIBRARIES": [ + "xcb", + "libunwind", + "qt5" + ], + "ARCHIVE_WITHOUT_V7": true, + "COMMIT_TAG": "20230408" +} \ No newline at end of file diff --git a/engines/openapoc/env.sh b/engines/openapoc/env.sh deleted file mode 100755 index 47527ab81..000000000 --- a/engines/openapoc/env.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -export STEAM_APP_ID_LIST="7660" -export LICENSE_PATH="./source/LICENSE" -export LIBRARIES="xcb libunwind qt5" -export ARCHIVE_WITHOUT_V7="1" diff --git a/engines/opengothic/build.sh b/engines/opengothic/build.sh index 209b251b2..52f3e2d48 100755 --- a/engines/opengothic/build.sh +++ b/engines/opengothic/build.sh @@ -14,7 +14,7 @@ sudo ldconfig # CLONE PHASE git clone https://github.com/Try/OpenGothic source pushd source -git checkout -f 16fff0e +git checkout -f "$COMMIT_TAG" git submodule update --init --recursive popd diff --git a/engines/opengothic/env.json b/engines/opengothic/env.json new file mode 100644 index 000000000..b0e086f0b --- /dev/null +++ b/engines/opengothic/env.json @@ -0,0 +1,8 @@ +{ + "STEAM_APP_ID_LIST": [ + "65540", + "39510" + ], + "LICENSE_PATH": "./source/LICENSE", + "COMMIT_TAG": "v0.75" +} \ No newline at end of file diff --git a/engines/opengothic/env.sh b/engines/opengothic/env.sh deleted file mode 100755 index c03fb292b..000000000 --- a/engines/opengothic/env.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -export STEAM_APP_ID_LIST="65540 39510" -export LICENSE_PATH="./source/LICENSE"