From c5ba5096700aab2092038714e5e75eeca5836ce7 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Thu, 14 Jan 2016 17:28:12 +0300 Subject: [PATCH] [styles] Use _legacy suffix in scripts and qt.pro --- android/script/replace_links.bat | 14 ++++---- qt/qt.pro | 10 +++--- tizen/scripts/update_assets_for_unit_tests.sh | 4 +-- tizen/scripts/update_assets_for_version.sh | 4 +-- tools/android/update_assets_for_version.sh | 4 +-- tools/android/update_assets_yota.sh | 32 +++++++++---------- tools/unix/generate_symbols.sh | 14 ++++---- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/android/script/replace_links.bat b/android/script/replace_links.bat index 6ff53697f5..d3269711b6 100644 --- a/android/script/replace_links.bat +++ b/android/script/replace_links.bat @@ -6,7 +6,7 @@ cp ../data/categories.txt assets/ cp ../data/classificator.txt assets/ cp ../data/copyright.html assets/ cp ../data/countries.txt assets/ -cp ../data/drules_proto.bin assets/ +cp ../data/drules_proto_legacy.bin assets/ cp ../data/drules_proto_dark.bin assets/ cp ../data/drules_proto_clear.bin assets/ cp ../data/external_resources.txt assets/ @@ -18,22 +18,22 @@ cp ../data/packed_polygons.bin assets/ cp ../data/types.txt assets/ cp ../data/unicode_blocks.txt assets/ -cp -r ../data/resources-hdpi/ assets/ +cp -r ../data/resources-hdpi_legacy/ assets/ cp -r ../data/resources-hdpi_dark/ assets/ cp -r ../data/resources-hdpi_clear/ assets/ -cp -r ../data/resources-ldpi/ assets/ +cp -r ../data/resources-ldpi_legacy/ assets/ cp -r ../data/resources-ldpi_dark/ assets/ cp -r ../data/resources-ldpi_clear/ assets/ -cp -r ../data/resources-mdpi/ assets/ +cp -r ../data/resources-mdpi_legacy/ assets/ cp -r ../data/resources-mdpi_dark/ assets/ cp -r ../data/resources-mdpi_clear/ assets/ -cp -r ../data/resources-xhdpi/ assets/ +cp -r ../data/resources-xhdpi_legacy/ assets/ cp -r ../data/resources-xhdpi_dark/ assets/ cp -r ../data/resources-xhdpi_clear/ assets/ -cp -r ../data/resources-xxhdpi/ assets/ +cp -r ../data/resources-xxhdpi_legacy/ assets/ cp -r ../data/resources-xxhdpi_dark/ assets/ cp -r ../data/resources-xxhdpi_clear/ assets/ -cp -r ../data/resources-6plus/ assets/ +cp -r ../data/resources-6plus_legacy/ assets/ cp -r ../data/resources-6plus_dark/ assets/ cp -r ../data/resources-6plus_clear/ assets/ diff --git a/qt/qt.pro b/qt/qt.pro index c1ee0d8a89..2745d28ee6 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -63,13 +63,13 @@ OTHER_RES.files = ../data/copyright.html ../data/eula.html ../data/welcome.html CLASSIFICATOR_RES.path = $$DATADIR CLASSIFICATOR_RES.files = ../data/classificator.txt \ ../data/types.txt \ - ../data/drules_proto.bin + ../data/drules_proto_legacy.bin DEFAULT_SKIN_RES.path = $$DATADIR/resources-default DEFAULT_SKIN_RES.files = ../resources-default/default.ui -MDPI_SKIN_RES.path = $$DATADIR/resources-mdpi -MDPI_SKIN_RES.files = ../data/resources-mdpi/symbols.sdf ../data/resources-mdpi/symbols.png -XHDPI_SKIN_RES.path = $$DATADIR/resources-xhdpi -XHDPI_SKIN_RES.files = ../data/resources-xhdpi/symbols.sdf ../data/resources-xhdpi/symbols.png +MDPI_SKIN_RES.path = $$DATADIR/resources-mdpi_legacy +MDPI_SKIN_RES.files = ../data/resources-mdpi_legacy/symbols.sdf ../data/resources-mdpi_legacy/symbols.png +XHDPI_SKIN_RES.path = $$DATADIR/resources-xhdpi_legacy +XHDPI_SKIN_RES.files = ../data/resources-xhdpi_legacy/symbols.sdf ../data/resources-xhdpi_legacy/symbols.png FONT_RES.path = $$FONTSDIR FONT_RES.files = ../data/01_dejavusans.ttf \ diff --git a/tizen/scripts/update_assets_for_unit_tests.sh b/tizen/scripts/update_assets_for_unit_tests.sh index 6642d9e914..bbb6b7f002 100755 --- a/tizen/scripts/update_assets_for_unit_tests.sh +++ b/tizen/scripts/update_assets_for_unit_tests.sh @@ -8,9 +8,9 @@ DST=$1 #rm -rf $DST #mkdir $DST -files=(copyright.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt +files=(copyright.html resources-ldpi_legacy resources-mdpi_legacy resources-hdpi_legacy resources-xhdpi_legacy resources-xxhdpi_legacy categories.txt classificator.txt types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \ - drules_proto.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf + drules_proto_legacy.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf minsk-pass.mwm) diff --git a/tizen/scripts/update_assets_for_version.sh b/tizen/scripts/update_assets_for_version.sh index b7996d7c40..2e039acdcf 100755 --- a/tizen/scripts/update_assets_for_version.sh +++ b/tizen/scripts/update_assets_for_version.sh @@ -8,9 +8,9 @@ DST=$1 rm -rf $DST mkdir $DST -files=(copyright.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt +files=(copyright.html resources-ldpi_legacy resources-mdpi_legacy resources-hdpi_legacy resources-xhdpi_legacy resources-xxhdpi_legacy categories.txt classificator.txt types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \ - drules_proto.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf + drules_proto_legacy.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 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[*]} diff --git a/tools/android/update_assets_for_version.sh b/tools/android/update_assets_for_version.sh index 4034a82913..0311d3c63e 100755 --- a/tools/android/update_assets_for_version.sh +++ b/tools/android/update_assets_for_version.sh @@ -8,12 +8,12 @@ DST=$2 rm -rf $DST || true mkdir $DST || true -files=(copyright.html faq.html resources-default resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt +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 resources-6plus_clear resources-6plus_dark types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt - drules_proto.bin drules_proto_dark.bin drules_proto_clear.bin external_resources.txt packed_polygons.bin countries.txt sound-strings colors.txt patterns.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 diff --git a/tools/android/update_assets_yota.sh b/tools/android/update_assets_yota.sh index 634c21a72d..1c2d4899a4 100755 --- a/tools/android/update_assets_yota.sh +++ b/tools/android/update_assets_yota.sh @@ -12,17 +12,17 @@ DST=../../android/YoPme/assets ./add_assets_mwm-ttf.sh $DST -rm -rf $DST/drules_proto.bin +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.bin -rm -rf $DST/resources-ldpi -rm -rf $DST/resources-mdpi -rm -rf $DST/resources-hdpi -rm -rf $DST/resources-xhdpi -rm -rf $DST/resources-xxhdpi -rm -rf $DST/resources-6plus +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 @@ -39,7 +39,7 @@ 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 $DST/resources-mdpi +ln -s $SRC/resources-yota_legacy $DST/resources-mdpi_legacy # Yota 2nd generation @@ -49,17 +49,17 @@ DST=../../android/YoPme2/assets ./add_assets_mwm-ttf.sh $DST -rm -rf $DST/drules_proto.bin +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.bin -rm -rf $DST/resources-ldpi -rm -rf $DST/resources-mdpi -rm -rf $DST/resources-hdpi -rm -rf $DST/resources-xhdpi -rm -rf $DST/resources-xxhdpi -rm -rf $DST/resources-6plus +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 @@ -76,4 +76,4 @@ 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 $DST/resources-mdpi +ln -s $SRC/resources-yota_legacy $DST/resources-mdpi_legacy diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index e8ffd4d225..5e4d3f9867 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -74,14 +74,14 @@ done # Build styles -BuildSkin legacy yota yota 19 true +BuildSkin legacy yota yota 19 true _legacy -BuildSkin legacy light ldpi 18 false -BuildSkin legacy light mdpi 18 false -BuildSkin legacy light hdpi 27 false -BuildSkin legacy light xhdpi 36 false -BuildSkin legacy light xxhdpi 54 false -BuildSkin legacy light 6plus 54 false +BuildSkin legacy light ldpi 18 false _legacy +BuildSkin legacy light mdpi 18 false _legacy +BuildSkin legacy light hdpi 27 false _legacy +BuildSkin legacy light xhdpi 36 false _legacy +BuildSkin legacy light xxhdpi 54 false _legacy +BuildSkin legacy light 6plus 54 false _legacy BuildSkin clear night ldpi 18 false _dark BuildSkin clear night mdpi 18 false _dark