From 2aeaabf0542392187d19bcdd20d1857a00e1540e Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Fri, 9 Oct 2009 01:35:58 +0000
Subject: [PATCH] directories relayout

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1037 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
---
 createRawResources.py                         | 29 +++++++++----------
 .../android/data => data}/default/keymap.xml  |  0
 .../android/data => data}/default/menubar.xml |  0
 .../android/data => data}/default/styles.xml  |  0
 4 files changed, 13 insertions(+), 16 deletions(-)
 rename {platform/android/data => data}/default/keymap.xml (100%)
 rename {platform/android/data => data}/default/menubar.xml (100%)
 rename {platform/android/data => data}/default/styles.xml (100%)

diff --git a/createRawResources.py b/createRawResources.py
index 4bafae0c5..54e2418a2 100755
--- a/createRawResources.py
+++ b/createRawResources.py
@@ -2,15 +2,13 @@
 
 import os, sys, shutil;
 
-project_dir = sys.argv[1]
-raw_res_dir = project_dir + "/res/raw"
-drawable_res_dir = project_dir + "/res/drawable"
-data_dir_common = project_dir + "/data"
-tree_icons_dir_android = project_dir + "/android_icons/tree"
-menu_icons_dir_android = project_dir + "/android_icons/menu"
-tabs_icons_dir_android = project_dir + "/android_icons/tabs"
-text_search_icons_dir_android = project_dir + "/android_icons/text_search"
-data_dir_android = project_dir + "/data"
+raw_res_dir = "res/raw"
+drawable_res_dir = "res/drawable"
+tree_icons_dir = "icons/tree"
+menu_icons_dir = "icons/menu"
+tabs_icons_dir = "icons/tabs"
+text_search_icons_dir = "icons/text_search"
+data_dir = "data"
 
 print os.getcwd()
 
@@ -34,10 +32,9 @@ def process_data_dir(prefix, dir, res_dir, replace_dot = 1):
 
 clean_res_dir(raw_res_dir)
 clean_res_dir(drawable_res_dir)
-process_data_dir("data__", data_dir_common, raw_res_dir)
-process_data_dir("data__", data_dir_android, raw_res_dir)
-shutil.copyfile(project_dir + "/android_icons/fbreader.png", drawable_res_dir + "/fbreader.png")
-process_data_dir("", tree_icons_dir_android, drawable_res_dir, 0)
-process_data_dir("", menu_icons_dir_android, drawable_res_dir, 0)
-process_data_dir("", tabs_icons_dir_android, drawable_res_dir, 0)
-process_data_dir("text_search_", text_search_icons_dir_android, drawable_res_dir, 0)
+process_data_dir("data__", data_dir, raw_res_dir)
+shutil.copyfile("icons/fbreader.png", drawable_res_dir + "/fbreader.png")
+process_data_dir("", tree_icons_dir, drawable_res_dir, 0)
+process_data_dir("", menu_icons_dir, drawable_res_dir, 0)
+process_data_dir("", tabs_icons_dir, drawable_res_dir, 0)
+process_data_dir("text_search_", text_search_icons_dir, drawable_res_dir, 0)
diff --git a/platform/android/data/default/keymap.xml b/data/default/keymap.xml
similarity index 100%
rename from platform/android/data/default/keymap.xml
rename to data/default/keymap.xml
diff --git a/platform/android/data/default/menubar.xml b/data/default/menubar.xml
similarity index 100%
rename from platform/android/data/default/menubar.xml
rename to data/default/menubar.xml
diff --git a/platform/android/data/default/styles.xml b/data/default/styles.xml
similarity index 100%
rename from platform/android/data/default/styles.xml
rename to data/default/styles.xml