gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] using flags as a shared resources between Pro and Lite version

Browse source
This commit is contained in:
rachytski 2012-07-03 12:40:07 -07:00 • committed by Alex Zolotarev
parent f4bba5a4ba
commit 2e2829e992
3 changed files with 25 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.gitignore vendored
View file

@ -105,19 +105,6 @@ android/MapsWithMeLite/local.properties
android/MapsWithMeLite/ant.properties
# local android scripts, such as debugger helper scrips
android/MapsWithMeLite/local
# ignore flags symlinks
android/MapsWithMeLite/res/drawable-xhdpi/??.png
android/MapsWithMeLite/res/drawable-xhdpi/do_hack.png
android/MapsWithMeLite/res/drawable-xhdpi/uk_england.png
android/MapsWithMeLite/res/drawable-xhdpi/uk_northern_ireland.png
android/MapsWithMeLite/res/drawable-xhdpi/uk_scotland.png
android/MapsWithMeLite/res/drawable-xhdpi/uk_wales.png
android/MapsWithMeLite/res/drawable-mdpi/??.png
android/MapsWithMeLite/res/drawable-mdpi/do_hack.png
android/MapsWithMeLite/res/drawable-mdpi/uk_england.png
android/MapsWithMeLite/res/drawable-mdpi/uk_northern_ireland.png
android/MapsWithMeLite/res/drawable-mdpi/uk_scotland.png
android/MapsWithMeLite/res/drawable-mdpi/uk_wales.png
# android MapsWithMePro
android/MapsWithMePro/bin
@ -133,20 +120,6 @@ android/MapsWithMePro/local.properties
android/MapsWithMePro/ant.properties
# local android scripts, such as debugger helper scrips
android/MapsWithMePro/local
# ignore flags symlinks
android/MapsWithMePro/res/drawable-xhdpi/??.png
android/MapsWithMePro/res/drawable-xhdpi/do_hack.png
android/MapsWithMePro/res/drawable-xhdpi/uk_england.png
android/MapsWithMePro/res/drawable-xhdpi/uk_northern_ireland.png
android/MapsWithMePro/res/drawable-xhdpi/uk_scotland.png
android/MapsWithMePro/res/drawable-xhdpi/uk_wales.png
android/MapsWithMePro/res/drawable-mdpi/??.png
android/MapsWithMePro/res/drawable-mdpi/do_hack.png
android/MapsWithMePro/res/drawable-mdpi/uk_england.png
android/MapsWithMePro/res/drawable-mdpi/uk_northern_ireland.png
android/MapsWithMePro/res/drawable-mdpi/uk_scotland.png
android/MapsWithMeLite/res/drawable-mdpi/uk_wales.png
# data
data/intermediate_data

28
tools/android/update_assets.sh
View file

@ -1,25 +1,3 @@
#!/bin/bash
set -x -u
SRC=../../data
DST=../../android/assets
# Remove old links
rm -rf $DST
mkdir $DST
files=(about.html basic_ldpi.skn basic_mdpi.skn basic_hdpi.skn basic_xhdpi.skn categories.txt classificator.txt
types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt \
symbols_ldpi.png symbols_mdpi.png symbols_hdpi.png symbols_xhdpi.png unicode_blocks.txt \
visibility.txt drules_proto.txt drules_proto.bin external_resources.txt packed_polygons.bin)
for item in ${files[*]}
do
ln -s $SRC/$item $DST/$item
done
# Separate case for World and countries list files without search support
ln -s $SRC/countries.txt $DST/countries.txt
# Call flag symlinks generation
./update_flags.sh
./update_assets_for_version.sh ../../android/MapsWithMePro/assets
./update_assets_for_version.sh ../../android/MapsWithMeLite/assets
./update_flags.sh

22
tools/android/update_assets_for_version.sh Executable file
View file

@ -0,0 +1,22 @@
#!/bin/bash
set -x -u
SRC=../../../data
DST=$1
# Remove old links
rm -rf $DST
mkdir $DST
files=(about.html basic_ldpi.skn basic_mdpi.skn basic_hdpi.skn basic_xhdpi.skn categories.txt classificator.txt
types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt \
symbols_ldpi.png symbols_mdpi.png symbols_hdpi.png symbols_xhdpi.png unicode_blocks.txt \
visibility.txt drules_proto.txt drules_proto.bin external_resources.txt packed_polygons.bin)
for item in ${files[*]}
do
ln -s $SRC/$item $DST/$item
done
# Separate case for World and countries list files without search support
ln -s $SRC/countries.txt $DST/countries.txt