From a734ea0eb0cb67fe0cba5f4f88f4d167fa8251e8 Mon Sep 17 00:00:00 2001
From: Dmitry Kunin <dkunin@mapswithme.com>
Date: Wed, 16 Oct 2013 11:53:43 +0200
Subject: [PATCH] Moved index.dat, removed rename_articles_desktop

---
 android/gradle.properties        |  2 +-
 builder/wikivoyage/makeapk.sh    |  4 ++--
 builder/wikivoyage/wikivoyage.mk | 15 ++++-----------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index 11a3dac..efc5b86 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,4 @@
-GWMvc=4
+GWMvc=6
 GWMvn=1.2
 GWMpn=com.guidewithme.any
 GWMapk=Any_Guide_With_Me
diff --git a/builder/wikivoyage/makeapk.sh b/builder/wikivoyage/makeapk.sh
index 43e6cba..d856e7f 100644
--- a/builder/wikivoyage/makeapk.sh
+++ b/builder/wikivoyage/makeapk.sh
@@ -6,7 +6,7 @@ cat countries_to_generate.txt | while read country; do
 
     # copy index
     rm ../../android/assets/index.dat || echo "No previous index found."
-    cp -f Countries/$country/index.dat ../../android/assets/
+    cp -f Countries/$country/content/data/index.dat ../../android/assets/
 
     # copy resources
     toCopy=(drawable-ldpi drawable-mdpi drawable-hdpi \
@@ -39,5 +39,5 @@ cat countries_to_generate.txt | while read country; do
         "-PGWMappName=$TITLE Guide With Me" clean assembleRelease
     popd
 
-    cp  ../../android/build/apk/* Countries/$country/
+    cp  ../../android/build/apk/*release.apk Countries/$country/
 done
diff --git a/builder/wikivoyage/wikivoyage.mk b/builder/wikivoyage/wikivoyage.mk
index 256dbc9..97cd4a0 100644
--- a/builder/wikivoyage/wikivoyage.mk
+++ b/builder/wikivoyage/wikivoyage.mk
@@ -55,21 +55,14 @@ download_images: image_url.txt image_url_desktop.txt
 	wget --wait=0.2 --random-wait --no-clobber --directory-prefix=images --input-file=image_url_desktop.txt || true
 	touch download_images
 
-rename_articles_mobile:
+rename_articles:
 	for f in articles/*; do mv $$f $$(echo $$f | sed 's/wiki.curid=//g'); done
-	touch rename_articles_mobile
-
-rename_articles_desktop:
-	for f in articles_desktop/*; do mv $$f $$(echo $$f | sed 's/wiki.curid=//g'); done
-	touch rename_articles_desktop
-
-rename_articles: rename_articles_mobile rename_articles_desktop
 	touch rename_articles
 
 countries.txt: load_sql_dumps
 	$$BIN/generate_article_info.sh
 
-clean_up_countries: countries.txt
+clean_up_countries: countries.txt rename_articles
 	$$BIN/clean_up_countries.sh
 
 geocodes_from_html.txt: download_articles
@@ -87,12 +80,12 @@ geocodes.txt: geocodes_from_html.txt geocodes_todo.txt
 	cp geocodes_from_html.txt geocodes.txt
 	touch geocodes.txt
 
-process_html: clean_up_countries
+process_html: clean_up_countries geocodes.txt
 	cat countries_to_generate.txt | while read country; do mkdir -p Countries/$$country/content/data; ../htmlprocessor/processor.sh articles/ images/ $$country.info.txt $$country.redirect.txt geocodes.txt Countries/$$country/content/data; done
 	touch process_html
 
 genindex: geocodes.txt clean_up_countries
-	cat countries_to_generate.txt | while read country; do ../genindex/genindex $$country.info.txt $$country.redirect.txt geocodes.txt Countries/$$country/index.dat; done
+	cat countries_to_generate.txt | while read country; do ../genindex/genindex $$country.info.txt $$country.redirect.txt geocodes.txt Countries/$$country/content/data/index.dat; done
 	touch genindex
 
 make_obb: process_html