From 8d0af4b1845b1ecb6abc6df88593d2aecd1cf29b Mon Sep 17 00:00:00 2001 From: Itms Date: Wed, 4 Sep 2024 17:19:49 +0200 Subject: [PATCH] Unify Windows scripts for getting nightly binaries The new script merges existing scripts for downloading translations and SPIR-V shaders, and also exports game binaries from the latest nightly build into the git repo. This allows contributors, especially artists, to obtain a working build of the game without learning how to build the game for Windows, refs #1814. --- .gitignore | 3 +- binaries/system/get-nightly-binaries.bat | 34 +++++++++++++++++++ .../tools/i18n/get-nightly-translations.bat | 11 ------ source/tools/spirv/get-nightly-shaders.bat | 5 --- 4 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 binaries/system/get-nightly-binaries.bat delete mode 100644 source/tools/i18n/get-nightly-translations.bat delete mode 100644 source/tools/spirv/get-nightly-shaders.bat diff --git a/.gitignore b/.gitignore index 4fc26cf423..b58e6336cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ # Built and prebuilt binaries binaries/system/* -!binaries/system/Atlas.bat -!binaries/system/Quickstart.bat +!binaries/system/*.bat !binaries/system/readme.txt # Workspaces diff --git a/binaries/system/get-nightly-binaries.bat b/binaries/system/get-nightly-binaries.bat new file mode 100644 index 0000000000..c471658102 --- /dev/null +++ b/binaries/system/get-nightly-binaries.bat @@ -0,0 +1,34 @@ +rem **Download from the latest nightly build:** +rem ** - translations** +rem ** - SPIR-V shaders** +rem ** - game built files for Windows** + +rem **This will overwrite any uncommitted changes to:** +rem ** - messages.json in i18n folders** +rem ** - readme.txt and helper scripts in this directory** + +where svn || ( + @echo. + @echo The "svn" executable was not found in your PATH. Make sure you installed TortoiseSVN + @echo and that you selected "command line client tools" during the installation. + @echo. + @pause + @exit +) + +set "repourl=https://svn.wildfiregames.com/nightly-build/trunk" + +rem **Translations** +svn export --force --depth files %repourl%/binaries/data/l10n ..\data\l10n +for %%m in (mod public) do ( + svn export --force --depth files %repourl%/binaries/data/mods/%%m/l10n ..\data\mods\%%m\l10n +) +svn export --force %repourl%/binaries/data/mods/public/gui/credits/texts/translators.json ..\data\mods\public\gui\credits\texts\translators.json + +rem **SPIR-V shaders** +for %%m in (mod public) do ( + svn export --force %repourl%/binaries/data/mods/%%m/shaders/spirv ..\data\mods\%%m\shaders\spirv +) + +rem **Game built files** +svn export --force %repourl%/binaries/system . diff --git a/source/tools/i18n/get-nightly-translations.bat b/source/tools/i18n/get-nightly-translations.bat deleted file mode 100644 index 2eca111398..0000000000 --- a/source/tools/i18n/get-nightly-translations.bat +++ /dev/null @@ -1,11 +0,0 @@ -rem **Download translations from the latest nightly build** - -rem **This will overwrite any uncommitted changes to messages.json files** - -svn export --force --depth files https://svn.wildfiregames.com/nightly-build/trunk/binaries/data/l10n ..\..\..\binaries\data\l10n - -for %%m in (mod public) do ( - svn export --force --depth files https://svn.wildfiregames.com/nightly-build/trunk/binaries/data/mods/%%m/l10n ..\..\..\binaries\data\mods\%%m\l10n -) - -svn export --force https://svn.wildfiregames.com/nightly-build/trunk/binaries/data/mods/public/gui/credits/texts/translators.json ..\..\..\binaries\data\mods\public\gui\credits\texts\translators.json diff --git a/source/tools/spirv/get-nightly-shaders.bat b/source/tools/spirv/get-nightly-shaders.bat deleted file mode 100644 index d34b91d5f4..0000000000 --- a/source/tools/spirv/get-nightly-shaders.bat +++ /dev/null @@ -1,5 +0,0 @@ -rem **Download SPIR-V shaders from the latest nightly build** - -for %%m in (mod public) do ( - svn export --force https://svn.wildfiregames.com/nightly-build/trunk/binaries/data/mods/%%m/shaders/spirv ..\..\..\binaries\data\mods\%%m\shaders\spirv -)