From 6932189f21b97812f7b6e892c331d9f681e59bfd Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 19 May 2023 16:17:56 +0300 Subject: [PATCH] OpenTTD: fixed ICU data location --- .github/workflows/openttd.yml | 5 +++-- project/jni/application/openttd/pack-data.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/openttd.yml b/.github/workflows/openttd.yml index ed27f833e..4fc9605d0 100644 --- a/.github/workflows/openttd.yml +++ b/.github/workflows/openttd.yml @@ -68,7 +68,7 @@ jobs: - name: Get ICU revision id: icu-rev - run: echo "ICU_REV=`git -C project/jni/iconv/src rev-parse HEAD`:`echo ${ARCH_LIST} | sed 's/ /:/g'`" >> $GITHUB_ENV + run: echo "ICU_REV=`git -C project/jni/iconv/src rev-parse HEAD`::`echo ${ARCH_LIST} | sed 's/ /:/g'`" >> $GITHUB_ENV - name: Copy ICU libraries from cache uses: actions/cache@v2 @@ -81,10 +81,11 @@ jobs: project/jni/iconv/lib project/jni/icuuc/include project/jni/icuuc/lib + project/jni/icuuc/share/icu - name: Touch cached ICU timestamps if: steps.cache-icu.outputs.cache-hit == 'true' - run: touch project/jni/iconv/lib/*/* project/jni/icuuc/lib/*/* || true + run: touch project/jni/iconv/lib/*/* project/jni/icuuc/lib/*/* project/jni/icuuc/share/icu/*/* || true - name: Patch Java files and build Boost, ICU, and OpenSSL run: | diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index 3243e7511..c9de76f21 100755 --- a/project/jni/application/openttd/pack-data.sh +++ b/project/jni/application/openttd/pack-data.sh @@ -32,7 +32,7 @@ ANDROID_DATA_FULLPATH=$(realpath ./AndroidData/) # ICU # TODO handle versioning. Use Makefile var [ -e ${ANDROID_DATA_FULLPATH}/icudt62l.zip.xz ] && [ -n "$NO_REBUILD_DATA" ] || { - pushd ../../iconv/src/$ARCH/ + pushd ../../icuuc rm -f ${ANDROID_DATA_FULLPATH}/icudt62l.zip.xz ${ANDROID_DATA_FULLPATH}/icudt62l.zip zip -0 ${ANDROID_DATA_FULLPATH}/icudt62l.zip share/icu/62.1/icudt62l.dat && xz -8 ${ANDROID_DATA_FULLPATH}/icudt62l.zip popd