Merge pull request #3258 from Zverik/fixdestoolnew-search_map-style-editor

[designer] Make designer tool great again

3 files changed, 15 insertions, 15 deletions

diff --git a/omim.pro b/omim.pro
index 40a755630e..40ea55cfcc 100644
--- a/omim.pro
+++ b/omim.pro
@@ -53,6 +53,7 @@ SUBDIRS = 3party base coding geometry editor indexer routing search
   SUBDIRS *= drape drape_frontend map
 
   CONFIG(map_designer):CONFIG(desktop) {
+    skin_generator.depends = $$SUBDIRS
     SUBDIRS *= skin_generator
   }
 
@@ -87,6 +88,13 @@ SUBDIRS = 3party base coding geometry editor indexer routing search
     SUBDIRS *= search_quality search_quality_tool features_collector_tool
   }
 
+  CONFIG(map_designer):CONFIG(no-tests) {
+    # Designer Tool package includes style tests
+    style_tests.subdir = map/style_tests
+    style_tests.depends = map indexer platform geometry coding base
+    SUBDIRS *= style_tests
+  }
+
   CONFIG(desktop):!CONFIG(no-tests) {
     # Additional desktop-only, tests-only libraries.
     platform_tests_support.subdir = platform/platform_tests_support
diff --git a/tools/python/stylesheet/drules_info.py b/tools/python/stylesheet/drules_info.py
index 97ffa823db..5b0f2acec6 100644
--- a/tools/python/stylesheet/drules_info.py
+++ b/tools/python/stylesheet/drules_info.py
@@ -41,10 +41,10 @@ def GetClassesZoomRange(drules_path):
                     zooms[1] = elem.scale
         if zooms[0] != -1:
             if name in result:
-                if result[name][0].scale < zooms[0]:
-                    zooms[0] = result[name][0].scale
-                if result[name][1].scale > zooms[1]:
-                    zooms[1] = result[name][1].scale
+                if result[name][0]< zooms[0]:
+                    zooms[0] = result[name][0]
+                if result[name][1]> zooms[1]:
+                    zooms[1] = result[name][1]
             result[name] = zooms
     return result
 
diff --git a/tools/unix/build_designer.sh b/tools/unix/build_designer.sh
index 8e33b7830b..091ee33d0f 100755
--- a/tools/unix/build_designer.sh
+++ b/tools/unix/build_designer.sh
@@ -5,10 +5,6 @@ set -e -u
 APP_VERSION=UNKNOWN
 [ $# -gt 0 ] && APP_VERSION=$1
 DESIGNER_CODEBASE_SHA=$(git log -1 --format="%H")
-
-echo "App version: $APP_VERSION"
-echo "Commit SHA: $DESIGNER_CODEBASE_SHA"
-
 OMIM_PATH="$(cd "${OMIM_PATH:-$(dirname "$0")/../..}"; pwd)"
 DATA_PATH="$OMIM_PATH/data"
 BUILD_PATH="$OMIM_PATH/out"
@@ -24,14 +20,10 @@ cat > "$OMIM_PATH/designer_version.h" <<DVER
 #define DESIGNER_DATA_VERSION ""
 DVER
 
-# Substitute tools/autobuild/build.sh
-rm "$OMIM_PATH/tools/autobuild/build.sh"
-cp "$OMIM_PATH/tools/autobuild/build_designer.sh" "$OMIM_PATH/tools/autobuild/build.sh"
-
 rm -rf "$RELEASE_PATH"
 (
   cd "$OMIM_PATH"
-  ${QMAKE-qmake} omim.pro -r -spec macx-clang CONFIG+=release CONFIG+=x86_64 CONFIG+=map_designer
+  ${QMAKE-qmake} omim.pro -r -spec macx-clang CONFIG+=release CONFIG+=x86_64 CONFIG+=map_designer CONFIG+=no-tests
   make -j8
 )
 
@@ -52,11 +44,11 @@ cp "$OMIM_PATH/tools/python/recalculate_geom_index.py" "$MAC_RESOURCES/recalcula
 # Copy all drules and  resources (required for test environment)
 rm -rf $MAC_RESOURCES/drules_proto*
 rm -rf $MAC_RESOURCES/resources-*
-for i in 6plus ldpi mdpi hdpi xhdpi xxhdpi; do
+for i in ldpi mdpi hdpi xhdpi xxhdpi 6plus; do
   cp -r $OMIM_PATH/data/resources-${i}_legacy/ $MAC_RESOURCES/resources-$i/
 done
 cp $OMIM_PATH/data/drules_proto_legacy.bin $MAC_RESOURCES/drules_proto.bin
-for i in resources-default cuisine-strings WorldCoasts_obsolete.mwm countries.txt cuisines.txt countries_obsolete.txt packed_polygons.bin packed_polygons_obsolete.bin; do
+for i in resources-default countries-strings cuisine-strings WorldCoasts_obsolete.mwm countries.txt cuisines.txt countries_obsolete.txt packed_polygons.bin packed_polygons_obsolete.bin; do
   cp -r $OMIM_PATH/data/$i $MAC_RESOURCES/
 done