From ba28af0463571e77f69b209f195ed368b051a155 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Wed, 20 Jan 2016 17:51:19 +0300 Subject: [PATCH] [build] Delete android assets scripts --- tools/android/add_assets_mwm-ttf.sh | 14 ---- tools/android/set_up_android.py | 6 -- tools/android/update_assets.sh | 5 -- tools/android/update_assets_for_version.sh | 22 ------ tools/android/update_assets_yota.sh | 81 ---------------------- tools/unix/generate_styles.sh | 5 -- 6 files changed, 133 deletions(-) delete mode 100755 tools/android/add_assets_mwm-ttf.sh delete mode 100755 tools/android/update_assets.sh delete mode 100755 tools/android/update_assets_for_version.sh delete mode 100755 tools/android/update_assets_yota.sh diff --git a/tools/android/add_assets_mwm-ttf.sh b/tools/android/add_assets_mwm-ttf.sh deleted file mode 100755 index 51e8cd093e..0000000000 --- a/tools/android/add_assets_mwm-ttf.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -e -u - -[ $# -lt 2 ] && echo "Usage: $0 " && exit 1 -SRC="$1" -DST="$2" - -files=(World.mwm WorldCoasts.mwm \ - 01_dejavusans.ttf 02_droidsans-fallback.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf) - -for item in ${files[*]} -do - ln -s -f "$SRC/$item" "$DST/$item" -done diff --git a/tools/android/set_up_android.py b/tools/android/set_up_android.py index 06c1c444fb..4485992c05 100755 --- a/tools/android/set_up_android.py +++ b/tools/android/set_up_android.py @@ -32,10 +32,6 @@ def locate_ndk(ndkPath): exit(1) -def update_assets(): - return os.system('./update_assets.sh') - - def write_local_properties(sdkDir, ndkDir): locPropsContent = ('# Autogenerated file\n' + '# Do not add it to version control\n' + @@ -90,8 +86,6 @@ def run(): sdkDir = locate_sdk(sdk) ndkDir = locate_ndk(ndk) - print '>>> Updating assets' - update_assets() print '>>> Writing local.properties' write_local_properties(sdkDir, ndkDir) print '>>> Done!' diff --git a/tools/android/update_assets.sh b/tools/android/update_assets.sh deleted file mode 100755 index 7509b8f69e..0000000000 --- a/tools/android/update_assets.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -SCRIPTS_PATH="$(dirname "$0")" -OMIM_PATH="${OMIM_PATH:-$SCRIPTS_PATH/../..}" -"$SCRIPTS_PATH/update_assets_for_version.sh" "$OMIM_PATH/data" "$OMIM_PATH/android/assets" -"$SCRIPTS_PATH/add_assets_mwm-ttf.sh" "$OMIM_PATH/data" "$OMIM_PATH/android/flavors/mwm-ttf-assets" diff --git a/tools/android/update_assets_for_version.sh b/tools/android/update_assets_for_version.sh deleted file mode 100755 index 9764a0829a..0000000000 --- a/tools/android/update_assets_for_version.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -e -u - -[ $# -lt 2 ] && echo "Usage: $0 " && exit 1 -SRC="$1" -DST="$2" - -# Remove old links -rm -rf "$DST" || true -mkdir "$DST" || true - -files=(copyright.html faq.html resources-default resources-ldpi_legacy resources-mdpi_legacy resources-hdpi_legacy resources-xhdpi_legacy resources-xxhdpi_legacy categories.txt classificator.txt - resources-ldpi_dark resources-mdpi_dark resources-hdpi_dark resources-xhdpi_dark resources-xxhdpi_dark - resources-ldpi_clear resources-mdpi_clear resources-hdpi_clear resources-xhdpi_clear resources-xxhdpi_clear - resources-6plus_legacy resources-6plus_clear resources-6plus_dark - types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt - drules_proto_legacy.bin drules_proto_dark.bin drules_proto_clear.bin external_resources.txt packed_polygons.bin countries.txt sound-strings colors.txt patterns.txt) - -for item in ${files[*]} -do - ln -s "$SRC/$item" "$DST/$item" -done diff --git a/tools/android/update_assets_yota.sh b/tools/android/update_assets_yota.sh deleted file mode 100755 index a7749bbe09..0000000000 --- a/tools/android/update_assets_yota.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -set -u - -# Pre-installed lite version apk should have a reference to mwm and ttf assets in the gradle file - -# Yota 1st generation - -SCRIPTS_PATH="$(dirname "$0")" -OMIM_PATH="${OMIM_PATH:-$SCRIPTS_PATH/../..}" -SRC="$OMIM_PATH/data" -DST="$OMIM_PATH/android/YoPme/assets" - -"$SCRIPTS_PATH/update_assets_for_version.sh" "$SRC" "$DST" -"$SCRIPTS_PATH/add_assets_mwm-ttf.sh" "$SRC" "$DST" - - -rm -rf $DST/drules_proto_legacy.bin -rm -rf $DST/drules_proto_dark.bin -rm -rf $DST/drules_proto_clear.bin -ln -s $SRC/drules_proto-bw.bin $DST/drules_proto_legacy.bin - -rm -rf $DST/resources-ldpi_legacy -rm -rf $DST/resources-mdpi_legacy -rm -rf $DST/resources-hdpi_legacy -rm -rf $DST/resources-xhdpi_legacy -rm -rf $DST/resources-xxhdpi_legacy -rm -rf $DST/resources-6plus_legacy -rm -rf $DST/resources-ldpi_dark -rm -rf $DST/resources-mdpi_dark -rm -rf $DST/resources-hdpi_dark -rm -rf $DST/resources-xhdpi_dark -rm -rf $DST/resources-xxhdpi_dark -rm -rf $DST/resources-6plus_dark -rm -rf $DST/resources-ldpi_clear -rm -rf $DST/resources-mdpi_clear -rm -rf $DST/resources-hdpi_clear -rm -rf $DST/resources-xhdpi_clear -rm -rf $DST/resources-xxhdpi_clear -rm -rf $DST/resources-6plus_clear -rm -rf $DST/resources-default -rm -rf $DST/sound-strings -rm -rf $DST/colors.txt -rm -rf $DST/patterns.txt -ln -s $SRC/resources-yota_legacy $DST/resources-mdpi_legacy - -# Yota 2nd generation - -DST="$OMIM_PATH/android/YoPme2/assets" - -"$SCRIPTS_PATH/update_assets_for_version.sh" "$SRC" "$DST" -"$SCRIPTS_PATH/add_assets_mwm-ttf.sh" "$SRC" "$DST" - - -rm -rf $DST/drules_proto_legacy.bin -rm -rf $DST/drules_proto_dark.bin -rm -rf $DST/drules_proto_clear.bin -ln -s $SRC/drules_proto-bw.bin $DST/drules_proto_legacy.bin - -rm -rf $DST/resources-ldpi_legacy -rm -rf $DST/resources-mdpi_legacy -rm -rf $DST/resources-hdpi_legacy -rm -rf $DST/resources-xhdpi_legacy -rm -rf $DST/resources-xxhdpi_legacy -rm -rf $DST/resources-6plus_legacy -rm -rf $DST/resources-ldpi_dark -rm -rf $DST/resources-mdpi_dark -rm -rf $DST/resources-hdpi_dark -rm -rf $DST/resources-xhdpi_dark -rm -rf $DST/resources-xxhdpi_dark -rm -rf $DST/resources-6plus_dark -rm -rf $DST/resources-ldpi_clear -rm -rf $DST/resources-mdpi_clear -rm -rf $DST/resources-hdpi_clear -rm -rf $DST/resources-xhdpi_clear -rm -rf $DST/resources-xxhdpi_clear -rm -rf $DST/resources-6plus_clear -rm -rf $DST/resources-default -rm -rf $DST/sound-strings -rm -rf $DST/colors.txt -rm -rf $DST/patterns.txt -ln -s $SRC/resources-yota_legacy $DST/resources-mdpi_legacy diff --git a/tools/unix/generate_styles.sh b/tools/unix/generate_styles.sh index f7d1dd87cd..1228ab1c32 100755 --- a/tools/unix/generate_styles.sh +++ b/tools/unix/generate_styles.sh @@ -1,10 +1,5 @@ #!/bin/bash set -e -u - SCRIPTS_PATH="$(dirname "$0")" "$SCRIPTS_PATH/generate_symbols.sh" "$SCRIPTS_PATH/generate_drules.sh" - -ANDROID_PATH="$SCRIPTS_PATH/../android" -"$ANDROID_PATH/update_assets.sh" -"$ANDROID_PATH/update_assets_yota.sh"