From 1c4e02fbd3b8f84a663c8e1afdb314c17f0084fd Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Thu, 28 Jan 2016 13:28:09 +0100
Subject: [PATCH] [generator] Migrate suffix, move norouting files to intdir

---
 tools/unix/generate_planet.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh
index e4a02fb53a..df55eaf913 100755
--- a/tools/unix/generate_planet.sh
+++ b/tools/unix/generate_planet.sh
@@ -136,6 +136,7 @@ MERGE_INTERVAL=${MERGE_INTERVAL:-40}
 NODE_STORAGE=${NODE_STORAGE:-${NS:-mem}}
 ASYNC_PBF=${ASYNC_PBF-}
 KEEP_INTDIR=${KEEP_INTDIR-1}
+MIGRATE=${MIGRATE-1}
 # nproc is linux-only
 if [ "$(uname -s)" == "Darwin" ]; then
   CPUS="$(sysctl -n hw.ncpu)"
@@ -415,6 +416,7 @@ fi
 # Clean up temporary routing files
 [ -f "$OSRM_FLAG" ] && rm "$OSRM_FLAG"
 [ -n "$(ls "$TARGET" | grep '\.mwm\.osm2ft')" ] && mv "$TARGET"/*.mwm.osm2ft "$INTDIR"
+[ -n "$(ls "$TARGET" | grep '\.mwm\.norouting')" ] && mkdir -p "$INTDIR/norouting" && mv "$TARGET"/*.mwm.norouting "$INTDIR/norouting"
 
 if [ "$MODE" == "resources" ]; then
   putmode "Step 7: Updating resource lists"
@@ -422,11 +424,18 @@ if [ "$MODE" == "resources" ]; then
   "$SCRIPTS_PATH/../python/hierarchy_to_countries.py" --target "$TARGET" --hierarchy "$DATA_PATH/hierarchy.txt" --version "$VERSION" \
     --legacy --sort --names "$DATA_PATH/mwm_names_en.txt" --output "$TARGET/countries.txt" >> "$PLANET_LOG" 2>&1
 
+  # Migration suffix
+  if [ -n "$MIGRATE" ]; then
+    mv "$TARGET/countries.txt" "$TARGET/countries_migrate.txt"
+    mv "$TARGET/WorldCoasts.mwm" "$TARGET/WorldCoasts_migrate.mwm"
+    cp "$DATA_PATH/WorldCoasts.mwm" "$TARGET"
+  fi
+
   # A quick fix: chmodding to a+rw all generated files
   for file in "$TARGET"/*.mwm*; do
     chmod 0666 "$file"
   done
-  chmod 0666 "$TARGET/countries.txt"
+  chmod 0666 "$TARGET"/countries*.txt
 
   if [ -n "$OPT_WORLD" ]; then
     # Update external resources