From a0fd622ea7b0b8c5f7ea5ccf27b9192b6f8b2869 Mon Sep 17 00:00:00 2001 From: Alexis He Date: Sat, 11 Sep 2021 15:17:58 +0200 Subject: [PATCH] Change: move android embedded assets script to simutrans repository --- .github/workflows/nightly-android.yml | 2 +- android/add_assets.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 android/add_assets.sh diff --git a/.github/workflows/nightly-android.yml b/.github/workflows/nightly-android.yml index ee499f594..c3b8b58c0 100644 --- a/.github/workflows/nightly-android.yml +++ b/.github/workflows/nightly-android.yml @@ -74,7 +74,7 @@ jobs: - name: Checkout lib Android SDL by pelya (hard coded version) working-directory: /android-sdl run: | - git init && git remote add origin https://github.com/krosk/commandergenius.git && git fetch origin d81a0dbd290f65490287534b8934cf7d226be660 && git reset --hard FETCH_HEAD + git init && git remote add origin https://github.com/krosk/commandergenius.git && git fetch origin 145eccc3de6b3facc73acdcd319d2f02058da413 && git reset --hard FETCH_HEAD - name: Setup licenses for Gradle working-directory: /android-sdl diff --git a/android/add_assets.sh b/android/add_assets.sh new file mode 100644 index 000000000..0e0b0c605 --- /dev/null +++ b/android/add_assets.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# This script adds assets to embed with the Android build +# It is called by AndroidPreBuild.sh +# Working folder is expected to be this file location (/simutrans/android/ +# Assets are downloaded to this folder before being copied to the target location + +echo "Adding assets" + +[ -e ../simutrans/pak ] || (wget --show-progress -nc https://downloads.sourceforge.net/project/simutrans/pak64/122-0/simupak64-122-0.zip && unzip -n simupak64-122-0.zip -d ..) +[ -e ../simutrans/pak64.german ] || (wget --show-progress -nc http://simutrans-germany.com/pak.german/pak64.german_0-122-0-0-2_full.zip && unzip -n pak64.german_0-122-0-0-2_full.zip -d ..) +[ -e ../simutrans/music/TimGM6mb.sf2 ] || wget -nc --show-progress https://sourceforge.net/p/mscore/code/HEAD/tree/trunk/mscore/share/sound/TimGM6mb.sf2?format=raw -O ../simutrans/music/TimGM6mb.sf2 +[ -e ../simutrans/font/RobotoCondensed-Regular.ttf ] || (wget -nc --show-progress https://fonts.google.com/download?family=Roboto%20Condensed -O Roboto_Condensed.zip && unzip -n Roboto_Condensed.zip -d ../simutrans/font) +[ -e ../simutrans/font/Roboto-Regular.ttf ] || (wget -nc --show-progress https://fonts.google.com/download?family=Roboto -O Roboto.zip && unzip -n Roboto.zip -d ../simutrans/font) +[ -e ../simutrans/cacert.pem ] || cp ./cacert.pem ../simutrans/cacert.pem -- 2.28.0.windows.1