From de9044790430d94caea99e530823b606aa7f26a9 Mon Sep 17 00:00:00 2001 From: Gordon Pedersen Date: Tue, 1 Aug 2023 15:26:58 +1000 Subject: [PATCH] Fix package batch file and bump version number Also, adding the keystore to the repo so that it is actually saved somewhere --- .dragonruby | 2 +- cube-tube.keystore | Bin 0 -> 2766 bytes installer/installer.vdproj | 6 ++-- package.bat | 38 +++++++++++++++----------- 🕹️cube-tube/metadata/game_metadata.txt | 2 +- 5 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 cube-tube.keystore diff --git a/.dragonruby b/.dragonruby index ecb66b3..7a5a15f 160000 --- a/.dragonruby +++ b/.dragonruby @@ -1 +1 @@ -Subproject commit ecb66b31ace3b0ea0692f7042ab13a0ce2ad2eb2 +Subproject commit 7a5a15f0f24536e57f7577ddbb45f9b3a3fc23ea diff --git a/cube-tube.keystore b/cube-tube.keystore new file mode 100644 index 0000000000000000000000000000000000000000..0968c933ce084ec8838d2d276a594e40d5e6cfe6 GIT binary patch literal 2766 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 qsJ@9?2(T?roNUL cd /d %~dp0 -set CurrDirName=🕹️cube-tube +set gamedir=🕹️cube-tube for /F %%a IN ('powershell -command "$([guid]::NewGuid().ToString().toUpper())"') DO (set newProductCode=%%a) for /F %%a IN ('powershell -command "$([guid]::NewGuid().ToString().toUpper())"') DO (set newPackageCode=%%a) @setlocal ENABLEEXTENSIONS @set version=0 -@for /F "tokens=*" %%A in (./metadata/game_metadata.txt) do @call :CheckForVersion "%%A" +@for /F "tokens=*" %%A in (%gamedir%/metadata/game_metadata.txt) do @call :CheckForVersion "%%A" cd .dragonruby robocopy ../marketing-assets/AppIcon.appiconset ./dragonruby-ios.app/Assets.xcassets/AppIcon.appiconset /e robocopy ../marketing-assets/AppIcon.appiconset ./dragonruby-ios-simulator.app/Assets.xcassets/AppIcon.appiconset /e +robocopy ../%gamedir% ./%gameid% /e @echo on -dragonruby-publish --only-package ../%CurrDirName% +dragonruby-publish --only-package %gameid% @echo off +rd /s /q %gameid% + cd builds -if exist ./%CurrDirName%-windows-amd64.exe ( -if exist ../../%CurrDirName%/installer/installer.vdproj ( +if exist ./%gameid%-windows-amd64.exe ( +if exist ../../installer/installer.vdproj ( echo "Building windows installer..." - for /F "tokens=* USEBACKQ" %%t IN (`findstr /c:"%version%" ..\..\%CurrDirName%\installer\installer.vdproj`) do (SET OldVersion=%%t) + for /F "tokens=* USEBACKQ" %%t IN (`findstr /c:"%version%" ..\..\installer\installer.vdproj`) do (SET OldVersion=%%t) if defined OldVersion ( echo "version already the same" ) else ( echo "need to update version & product/package codes (%version%, %newProductCode%, %newPackageCode%)" - powershell -Command "(Get-Content ../../%CurrDirName%/installer/installer.vdproj) | Foreach-Object { $_ -replace '""""ProductCode"""" = """"8:\{.*\}""""$', '""""ProductCode"""" = """"8:{%newProductCode%}""""' -replace '""""PackageCode"""" = """"8:\{.*\}""""$', '""""PackageCode"""" = """"8:{%newPackageCode%}""""' -replace '""""ProductVersion"""" = """"8:.+""""$', '""""ProductVersion"""" = """"8:%version%""' } | Out-File -encoding UTF8 ../../%CurrDirName%/installer/installer.vdproj" + powershell -Command "(Get-Content ../../installer/installer.vdproj) | Foreach-Object { $_ -replace '""""ProductCode"""" = """"8:\{.*\}""""$', '""""ProductCode"""" = """"8:{%newProductCode%}""""' -replace '""""PackageCode"""" = """"8:\{.*\}""""$', '""""PackageCode"""" = """"8:{%newPackageCode%}""""' -replace '""""ProductVersion"""" = """"8:.+""""$', '""""ProductVersion"""" = """"8:%version%""' } | Out-File -encoding UTF8 ../../installer/installer.vdproj" ) - call "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe" ..\..\%CurrDirName%\installer\installer.sln /build Release + call "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe" ..\..\installer\installer.sln /build Release ) else ( ECHO "no installer project?" - ECHO ../../%CurrDirName%/installer/installer.vdproj + ECHO ../../installer/installer.vdproj ) ) else ( ECHO "no exe?" - ECHO ./%CurrDirName%-windows-amd64.exe + ECHO ./%gameid%-windows-amd64.exe ) -if not exist ./%CurrDirName%.keystore ( +if not exist ../../%gameid%.keystore ( echo "no keystore, generating keys" - keytool -genkey -v -keystore %CurrDirName%.keystore -alias %CurrDirName% -keyalg RSA -keysize 2048 -validity 10000 + keytool -genkey -v -keystore ../../%gameid%.keystore -alias %gameid% -keyalg RSA -keysize 2048 -validity 10000 ) -if exist ./%CurrDirName%-android.apk ( +if exist ./%gameid%-android.apk ( echo "Signing apk..." - call "C:\Program Files (x86)\Android\android-sdk\build-tools\32.0.0\apksigner.bat" sign -ks %CurrDirName%.keystore %CurrDirName%-android.apk + call "C:\Program Files (x86)\Android\android-sdk\build-tools\32.0.0\apksigner.bat" sign -ks ../../%gameid%.keystore %gameid%-android.apk echo "Signing aab..." - call jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore %CurrDirName%.keystore %CurrDirName%-googleplay.aab %CurrDirName% + call jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore ../../%gameid%.keystore %gameid%-googleplay.aab %gameid% ) else ( ECHO "no apk?" - ECHO ./%CurrDirName%-android.apk + ECHO ./%gameid%-android.apk ) ECHO "All done!" @@ -63,4 +67,6 @@ PAUSE @set _line=%~1 @set _linePrefeix=%_line:~0,8% @if "%_linePrefeix%" equ "version=" (@set version="%_line:~8%") +@set _linePrefeix=%_line:~0,7% +@if "%_linePrefeix%" equ "gameid=" (@set gameid="%_line:~7%") @exit /b 0 \ No newline at end of file diff --git a/🕹️cube-tube/metadata/game_metadata.txt b/🕹️cube-tube/metadata/game_metadata.txt index ea98c87..3dcf8cd 100644 --- a/🕹️cube-tube/metadata/game_metadata.txt +++ b/🕹️cube-tube/metadata/game_metadata.txt @@ -2,7 +2,7 @@ devid=deathau devtitle=death.au gameid=cube-tube gametitle=Cube Tube -version=0.1.0 +version=0.2.0 icon=metadata/icon.png # === Flags available at all licensing tiers ===