From 832d647e1e337175f1812d35ca17aae75269e20d Mon Sep 17 00:00:00 2001 From: Miguel Horta Date: Wed, 5 Jun 2024 22:51:56 +0100 Subject: [PATCH] Openttd release 14.1.rev127 --- project/jni/application/openttd/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openttd/pack-data.sh | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index bca5513e2..0b391d7be 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.fdroid # Application version code (integer) -AppVersionCode=1400126 +AppVersionCode=1410127 # Application user-visible version name (string) -AppVersionName="14.0.rev126" +AppVersionName="14.1.rev127" # Specify path to download application data in zip archive in the form "Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, '!!' will also hide the entry from the menu, so it cannot be disabled @@ -22,7 +22,7 @@ AppVersionName="14.0.rev126" # The mount directory will be returned by calling getenv("ANDROID_OBB_MOUNT_DIR") # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip -AppDataDownloadUrl="!!Data files|openttd-data-14.0-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!!!MIDI music support|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz^!!Fonts|openttd-fonts.zip.xz" +AppDataDownloadUrl="!!Data files|openttd-data-14.1-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!!!MIDI music support|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz^!!Fonts|openttd-fonts.zip.xz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index d47223c3a..0250b20d0 100755 --- a/project/jni/application/openttd/pack-data.sh +++ b/project/jni/application/openttd/pack-data.sh @@ -2,7 +2,7 @@ set -e -VER=14.0-0 +VER=14.1-0 ARCH=$1 ANDROID_DATA_FULLPATH=$(realpath ./AndroidData/) @@ -34,6 +34,10 @@ ANDROID_DATA_FULLPATH=$(realpath ./AndroidData/) [ -e ${ANDROID_DATA_FULLPATH}/icudt62l.zip.xz ] && [ -n "$NO_REBUILD_DATA" ] || { pushd ../../icuuc rm -f ${ANDROID_DATA_FULLPATH}/icudt62l.zip.xz ${ANDROID_DATA_FULLPATH}/icudt62l.zip + if ! [ -e ./share/icu/62.1/icudt62l.dat ]; then + echo "Missing icudt62l.data; Try force recompiling prebuilt targets"; + exit 1 + fi zip -0 ${ANDROID_DATA_FULLPATH}/icudt62l.zip share/icu/62.1/icudt62l.dat && xz -8 ${ANDROID_DATA_FULLPATH}/icudt62l.zip popd }