From d79084767fb26e84c44f08d1dd0fd9d3744ac875 Mon Sep 17 00:00:00 2001
From: Maksim Andrianov <maksimandrianov1@gmail.com>
Date: Fri, 25 Sep 2020 03:45:45 +0300
Subject: [PATCH] [generator] Fixes for production maps generation.

---
 generator/pygen/pygen.cpp                     |  2 +-
 tools/python/airmaps/setup.py                 |  1 +
 tools/python/maps_generator/generator/env.py  | 21 +++++++++++++------
 .../maps_generator/generator/settings.py      |  2 +-
 tools/python/maps_generator/setup.py          |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/generator/pygen/pygen.cpp b/generator/pygen/pygen.cpp
index b472022b4d..538bce7fbd 100644
--- a/generator/pygen/pygen.cpp
+++ b/generator/pygen/pygen.cpp
@@ -250,7 +250,7 @@ std::string ReadAll(std::string const & filename)
   return std::string(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>());
 }
 
-bool InitClassificator(std::string const & resourcePath)
+void InitClassificator(std::string const & resourcePath)
 {
   classificator::LoadTypes(
         ReadAll(base::JoinPath(resourcePath, "classificator.txt")),
diff --git a/tools/python/airmaps/setup.py b/tools/python/airmaps/setup.py
index de10f04a16..06c2b25aa8 100755
--- a/tools/python/airmaps/setup.py
+++ b/tools/python/airmaps/setup.py
@@ -21,6 +21,7 @@ with chdir(os.path.abspath(os.path.dirname(__file__))):
         description="This package contains tools for generating maps with Apache Airflow.",
         url="https://github.com/mapsme",
         package_dir={"airmaps": ""},
+        package_data={"": ["var/**/*"]},
         packages=[
             "airmaps",
             "airmaps.dags",
diff --git a/tools/python/maps_generator/generator/env.py b/tools/python/maps_generator/generator/env.py
index 24cac514fe..0a874a8fdf 100644
--- a/tools/python/maps_generator/generator/env.py
+++ b/tools/python/maps_generator/generator/env.py
@@ -489,12 +489,21 @@ class Env:
     @staticmethod
     def setup_generator_tool() -> AnyStr:
         logger.info("Check generator tool ...")
-        gen_tool_path = shutil.which(settings.GEN_TOOL)
-        if gen_tool_path is None:
-            logger.info(f"Find generator tool in {settings.BUILD_PATH} ...")
-            gen_tool_path = find_executable(settings.BUILD_PATH, settings.GEN_TOOL)
-        logger.info(f"Generator found - {gen_tool_path}")
-        return gen_tool_path
+        exceptions = []
+        for gen_tool in settings.POSSIBLE_GEN_TOOL_NAMES:
+            gen_tool_path = shutil.which(gen_tool)
+            if gen_tool_path is None:
+                logger.info(f"Looking for generator tool in {settings.BUILD_PATH} ...")
+                try:
+                    gen_tool_path = find_executable(settings.BUILD_PATH, gen_tool)
+                except FileNotFoundError as e:
+                    exceptions.append(e)
+                    continue
+
+            logger.info(f"Generator tool found - {gen_tool_path}")
+            return gen_tool_path
+
+        raise Exception(exceptions)
 
     @staticmethod
     def setup_osm_tools() -> Dict[AnyStr, AnyStr]:
diff --git a/tools/python/maps_generator/generator/settings.py b/tools/python/maps_generator/generator/settings.py
index 5269885783..71be1aa2ef 100644
--- a/tools/python/maps_generator/generator/settings.py
+++ b/tools/python/maps_generator/generator/settings.py
@@ -128,7 +128,7 @@ STATS_TYPES_CONFIG = os.path.join(ETC_DIR, "stats_types_config.txt")
 
 # Other variables:
 PLANET = "planet"
-GEN_TOOL = "generator_tool"
+POSSIBLE_GEN_TOOL_NAMES = ("generator_tool", "omim-generator_tool")
 VERSION_FILE_NAME = "version.txt"
 
 # Osm tools:
diff --git a/tools/python/maps_generator/setup.py b/tools/python/maps_generator/setup.py
index 098ada33c0..6e98d842b0 100755
--- a/tools/python/maps_generator/setup.py
+++ b/tools/python/maps_generator/setup.py
@@ -21,7 +21,7 @@ with chdir(os.path.abspath(os.path.dirname(__file__))):
         description="This package contains tools for maps generation.",
         url="https://github.com/mapsme",
         package_dir={"maps_generator": ""},
-        package_data={"": ["var/*"]},
+        package_data={"": ["var/**/*"]},
         packages=[
             "maps_generator",
             "maps_generator.generator",