[Libreoffice-commits] core.git: android/experimental

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile      |    4 ++--
 android/experimental/LibreOffice4Android/Makefile |    4 ++--
 android/experimental/desktop/Makefile             |    5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 01a13519e2a12e1e9b61bab1437d340e389e44bf
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 25 10:50:54 2013 +0300

    Fix bit-rot
    
    Change-Id: Iae6aa3c1326456dde7261f471ba7d963058f20a7

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 034b14f..63104dd 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -38,8 +38,8 @@ copy-stuff:
 		assets
 	cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
 #
-	cp -R $(INSTDIR)/share/registry assets/share
 	mkdir -p assets/share/config
+	cp -R $(INSTDIR)/share/registry assets/share
 	cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
 #
 # Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
@@ -60,7 +60,7 @@ copy-stuff:
 	echo "LO_LIB_DIR=file:$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc
 	echo "URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc # checkme - is this used to find configs ?
 	echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
-	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
+	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
 	echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc
 	echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb file://$(APP_DATA_PATH)/program/oovbaapi.rdb' >> assets/program/fundamentalrc
 	echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb' >> assets/program/fundamentalrc
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index fee5198..ee3325d 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -38,8 +38,8 @@ copy-stuff:
 		assets
 	cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
 #
-	cp -R $(INSTDIR)/share/registry assets/share
 	mkdir -p assets/share/config
+	cp -R $(INSTDIR)/share/registry assets/share
 	cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
 #
 # Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
@@ -60,7 +60,7 @@ copy-stuff:
 	echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc
 	echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc # checkme - is this used to find configs ?
 	echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
-	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
+	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
 	echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway' >> assets/program/fundamentalrc
 #
 # Set up unorc
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index a42b716..7a00e7e 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -39,8 +39,8 @@ copy-stuff:
 		assets
 	cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
 #
-	cp -R $(INSTDIR)/share/registry assets/share
 	mkdir -p assets/share/config
+	cp -R $(INSTDIR)/share/registry assets/share
 	cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
 #
 # Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
@@ -61,7 +61,7 @@ copy-stuff:
 	echo "LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc
 	echo "URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc # checkme - is this used to find configs ?
 	echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
-	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
+	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
 	echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc
 	echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb file://$(APP_DATA_PATH)/program/oovbaapi.rdb' >> assets/program/fundamentalrc
 	echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb' >> assets/program/fundamentalrc
@@ -111,7 +111,6 @@ copy-stuff:
 	echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup
 # ------------ Pieces not from DocumentLoader ------------
 # tango artwork / icons
-	mkdir -p assets/share/config
 	cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip assets/share/config
 # shell / splash images
 	mkdir -p assets/program