miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenTTD: fixed ICU data location

Browse Source
This commit is contained in:
pelya
2023-05-19 16:17:56 +03:00
parent 601d40b414
commit 6932189f21
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/openttd.yml vendored
View File

@@ -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: |

2
project/jni/application/openttd/pack-data.sh
View File

@@ -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