From 030bc385167e32c235719e4ee2b182e7665ad4ce Mon Sep 17 00:00:00 2001 From: Deve Date: Tue, 15 Oct 2019 01:04:24 +0200 Subject: [PATCH] Generate full assets in android builder --- android/generate_assets.sh | 11 ++++++++-- tools/android_builder.sh | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/android/generate_assets.sh b/android/generate_assets.sh index 4a9adea89..6980aa936 100755 --- a/android/generate_assets.sh +++ b/android/generate_assets.sh @@ -40,6 +40,7 @@ export SOUND_SAMPLE_DEFAULT=32000 export RUN_OPTIMIZE_SCRIPT_DEFAULT=0 export DECREASE_QUALITY_DEFAULT=1 export CONVERT_TO_JPG_DEFAULT=1 +export ONLY_ASSETS_DEFAULT=0 export ASSETS_PATHS="../data \ ../../stk-assets \ @@ -106,6 +107,10 @@ if [ -z "$CONVERT_TO_JPG" ]; then export CONVERT_TO_JPG="$CONVERT_TO_JPG_DEFAULT" fi +if [ -z "$ONLY_ASSETS" ]; then + export ONLY_ASSETS=$ONLY_ASSETS_DEFAULT +fi + # Find assets path for ASSETS_PATH in $ASSETS_PATHS; do if [ -d $ASSETS_PATH ] && [ `ls $ASSETS_PATH | grep -c tracks` -gt 0 ]; then @@ -641,8 +646,10 @@ fi # Copy data directory -echo "Copy data directory" -cp -a ../data/* assets/data/ +if [ $ONLY_ASSETS -eq 0 ]; then + echo "Copy data directory" + cp -a ../data/* assets/data/ +fi # Remove unused files diff --git a/tools/android_builder.sh b/tools/android_builder.sh index adef05b44..053439787 100755 --- a/tools/android_builder.sh +++ b/tools/android_builder.sh @@ -113,6 +113,44 @@ generate_assets() cd - } +generate_full_assets() +{ + echo "Generate zip file with full assets" + + if [ -f "./android-output/stk-assets.zip" ]; then + echo "Full assets already found in ./android-output/stk-assets.zip" + return + fi + + cp -a ./android/generate_assets.sh ./android-output/ + + cd ./android-output/ + + ONLY_ASSETS=1 \ + TRACKS="all" \ + TEXTURE_SIZE=512 \ + JPEG_QUALITY=95 \ + PNG_QUALITY=95 \ + PNGQUANT_QUALITY=95 \ + SOUND_QUALITY=112 \ + SOUND_MONO=0 \ + SOUND_SAMPLE=44100 \ + ./generate_assets.sh + + if [ ! -f "./assets/directories.txt" ]; then + echo "Error: Couldn't generate assets" + return + fi + + cd ./assets/data + zip -r ../../stk-assets.zip ./* + cd ../../ + + rm ./generate_assets.sh + + cd ../ +} + build_package() { export ARCH1=$1 @@ -195,3 +233,6 @@ PROJECT_CODE=$(($PROJECT_CODE + 1)) if [ -z "$1" ] || [ "$1" = "x86_64" ]; then build_package x86_64 x86_64 fi + +# Generate zip file with full assets +generate_full_assets