From 2c86ccf3dc1e8c0f8041d9399fbb457b708cbf0a Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 10 Aug 2025 07:49:43 -0300 Subject: [PATCH 1/3] Remove unused old scripts and configurations --- appveyor.yml | 14 ---------- export.bat | 10 ------- export.sh | 42 ----------------------------- language_verify.sh | 17 ------------ package | 35 ------------------------ package.ps1 | 66 ---------------------------------------------- 6 files changed, 184 deletions(-) delete mode 100644 appveyor.yml delete mode 100644 export.bat delete mode 100755 export.sh delete mode 100755 language_verify.sh delete mode 100755 package delete mode 100644 package.ps1 diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 0ad2ce9da4..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,14 +0,0 @@ -image: ubuntu -build_script: -- ps: ./package.ps1 -artifacts: -- path: 'artifacts\objects.zip' -deploy: - provider: GitHub - auth_token: - secure: 49K/y43epwh5Sb8uY1l/TbIFRPcEq6fraQaYGS0bgWQJfONznd6hCqPUCg7WSX16 - artifact: artifacts\objects.zip - draft: true - on: - branch: master - APPVEYOR_REPO_TAG: true diff --git a/export.bat b/export.bat deleted file mode 100644 index a0ff55fc00..0000000000 --- a/export.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -pushd tools\objexport - echo Building objexport - call nuget restore > nul - call msbuild /nologo /v:m /p:Configuration=Release "/p:Platform=Any CPU" -popd - -set RCT2OBJDIR=C:\Program Files (x86)\Infogrames\RollerCoaster Tycoon 2\ObjData -set OUTDIR=objects -call tools\objexport\bin\Release\objexport "%RCT2OBJDIR%" "%OUTDIR%" diff --git a/export.sh b/export.sh deleted file mode 100755 index 4351613888..0000000000 --- a/export.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Build objexport and export objects to json files - -echo "Export objects" -if [ $# -ne 2 ]; then - echo "Usage: export " - exit 1 -fi -objdata=$1 -outputdir=$2 - -function checkapp() -{ - which $1 &> /dev/null - if [ $? -ne 0 ]; then - echo -e "\033[0;31m$1 not found" - exit - fi -} - -# Check for required apps -checkapp mono -checkapp nuget -checkapp xbuild -checkapp fsharpc - -# Build objexport -pushd tools/objexport - echo -e "\e[36mBuilding objexport" - nuget restore > /dev/null - if [ $? -ne 0 ]; then exit; fi - xbuild /nologo /v:m /p:Configuration=Release "/p:Platform=Any CPU" - if [ $? -ne 0 ]; then exit; fi -popd - -objexport="tools/objexport/bin/Release/objexport.exe" -if [ ! -f $objexport ]; then - echo -e "\033[0;31m$objexport not found" - exit -fi - -mono $objexport $objdata $outputdir diff --git a/language_verify.sh b/language_verify.sh deleted file mode 100755 index 147bf798e3..0000000000 --- a/language_verify.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Exit on error. -set -e - -# We will need some directions... Let's make sure we get them. -if [ $# -ne 1 ] || [ ! -d $1 ]; - then echo "Usage: $0 " - exit -fi - -# Traverse input directory, and verify syntax in all files is correct. -find $1 -type f -name '*.json' | { - while read -r f; - do jq empty "$f" || echo "in $f"; - done -} diff --git a/package b/package deleted file mode 100755 index af5a3ee6d8..0000000000 --- a/package +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -set -e - -outDir="artifacts/objects" - -echo -e "\033[0;36mRe-creating artifacts directory...\033[0m" -rm -rf "artifacts" -mkdir -p "$outDir" - -echo -e "\033[0;36mCopying objects...\033[0m" -pushd objects > /dev/null - cp -r "official" "rct1" "rct2" "rct2ww" "rct2tt" "../$outDir" -popd > /dev/null - -echo -e "\033[0;36mCreating .parkobj files...\033[0m" -for i in $(find "$outDir" -type d); -do - objectFile="$i/object.json" - if [ -f "$objectFile" ]; then - objName=$(basename "$i") - src=$i - dst="$src.parkobj" - echo " $objName.parkobj" - pushd "$src" > /dev/null - zip -qr9 "../$objName.parkobj" * - popd > /dev/null - rm -rf "$src" - fi -done; - -echo -e "\033[0;36mCreating final archive...\033[0m" -pushd "$outDir" > /dev/null - zip -qr9 "../objects.zip" * -popd > /dev/null -rm -rf "$outDir" diff --git a/package.ps1 b/package.ps1 deleted file mode 100644 index 26e013cadf..0000000000 --- a/package.ps1 +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/pwsh -$ErrorActionPreference = "Stop" - -# Create zip archive containing objects -$useZip = $false -if (Get-Command "zip" -ErrorAction SilentlyContinue) -{ - # Use zip if possible as it handles permissions better on unix - $useZip = $true - Write-Host "Using zip instead of Compress-Archive" -} - -Write-Host -ForegroundColor Cyan "Re-creating artifacts directory..." -Remove-Item -Force -Recurse artifacts -ErrorAction SilentlyContinue -New-Item -Force -ItemType Directory artifacts,artifacts/objects | Out-Null - -Write-Host -ForegroundColor Cyan "Copying objects..." -Push-Location objects - Copy-Item -Recurse "official","rct1","rct2","rct2ww","rct2tt" ../artifacts/objects -Pop-Location - -Write-Host -ForegroundColor Cyan "Creating parkobj files..." -foreach ($d in Get-ChildItem -Directory -Recurse artifacts/objects) -{ - if (Test-Path (Join-Path $d.FullName object.json)) - { - $objName = $d.Name - $src = Resolve-Path -Relative $d.FullName - $dst = $src + ".parkobj" - Write-Host "$src -> $dst" - if ($useZip) - { - Push-Location $src - zip -r9 "../$objName.parkobj" (Get-ChildItem).Name - if ($LASTEXITCODE -ne 0) - { - throw "zip failed with $LASTEXITCODE" - } - Pop-Location - } - else - { - # We must use .zip extension for Compress-Archive to work - Compress-Archive -Force "$src/*" -DestinationPath ($dst + ".zip") -CompressionLevel Optimal - Move-Item ($dst + ".zip") $dst - } - Remove-Item -Force -Recurse $d.FullName - } -} - -Write-Host -ForegroundColor Cyan "Creating final archive..." -if ($useZip) -{ - Push-Location "artifacts/objects" - zip -r9 "../objects.zip" (Get-ChildItem).Name - if ($LASTEXITCODE -ne 0) - { - throw "zip failed with $LASTEXITCODE" - } - Pop-Location -} -else -{ - Compress-Archive -Force "artifacts/objects/*" -DestinationPath "artifacts/objects.zip" -CompressionLevel Optimal -} -Remove-Item -Force -Recurse artifacts/objects From 7119ccec3f7875ff376f987702ffe823c0fcd133 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 10 Aug 2025 07:52:23 -0300 Subject: [PATCH 2/3] Move scripts into tools/scripts --- .github/workflows/ci.yml | 2 +- build.mjs => tools/scripts/build.mjs | 0 .../scripts/language_clean_patch.py | 0 language_dump.py => tools/scripts/language_dump.py | 0 language_load.py => tools/scripts/language_load.py | 0 languages.py => tools/scripts/languages.py | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename build.mjs => tools/scripts/build.mjs (100%) rename language_clean_patch.py => tools/scripts/language_clean_patch.py (100%) rename language_dump.py => tools/scripts/language_dump.py (100%) rename language_load.py => tools/scripts/language_load.py (100%) rename languages.py => tools/scripts/languages.py (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02ac9aa1e7..da806c5cb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: tar -C "$GITHUB_WORKSPACE/bin" -xf tools.tar.gz echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH - name: Create objects.zip - run: ./build.mjs + run: ./tools/scripts/build.mjs - name: Upload artifacts uses: actions/upload-artifact@v4 with: diff --git a/build.mjs b/tools/scripts/build.mjs similarity index 100% rename from build.mjs rename to tools/scripts/build.mjs diff --git a/language_clean_patch.py b/tools/scripts/language_clean_patch.py similarity index 100% rename from language_clean_patch.py rename to tools/scripts/language_clean_patch.py diff --git a/language_dump.py b/tools/scripts/language_dump.py similarity index 100% rename from language_dump.py rename to tools/scripts/language_dump.py diff --git a/language_load.py b/tools/scripts/language_load.py similarity index 100% rename from language_load.py rename to tools/scripts/language_load.py diff --git a/languages.py b/tools/scripts/languages.py similarity index 100% rename from languages.py rename to tools/scripts/languages.py From cf3c203753d201ba238a0b7bd707097841678eb7 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 10 Aug 2025 07:55:41 -0300 Subject: [PATCH 3/3] Add comment to explain build.mjs purpose --- tools/scripts/build.mjs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/scripts/build.mjs b/tools/scripts/build.mjs index c74887acfd..03503a6bb7 100755 --- a/tools/scripts/build.mjs +++ b/tools/scripts/build.mjs @@ -1,4 +1,11 @@ #!/usr/bin/env node + +/** + * This script automates the build process for object assets. + * It copies source objects, reprocesses image arrays, compiles LGX images, + * and packages the results into .parkobj and .zip files. + */ + import fs from 'fs'; import path from 'path'; import { spawn } from 'child_process';