[Libreoffice-commits] .: android/qa

[Michael Meeks]

 android/qa/desktop/Makefile |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 9bea733ecf01da09aaf7281868441b8a02fcf5cc
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Jan 23 17:36:14 2012 +0000

    android: add missing component, icon theme, and UI config xml

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 18d9999..2d55786 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -38,7 +38,7 @@ buildrcs:
 	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 bundledext:$${$${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:$${$${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini xcsxcu:$${$${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry userext:$${$${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu' >> 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 user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu' >> 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:///assets/ure/share/misc/types.rdb file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc
 	echo 'URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb file:///assets/program/services/services.rdb <$$ORIGIN/services>*' >> assets/program/fundamentalrc
@@ -103,6 +103,7 @@ copy-stuff: buildrcs
 		  icuuclo \
 		  jvmaccessgcc3 \
 		  jvmfwk \
+		  localebe1.uno \
 		  localedata_en \
 		  localedata_es \
 		  localedata_euro \
@@ -155,12 +156,17 @@ copy-stuff: buildrcs
 	mkdir -p assets/program/types assets/program/services
 	mkdir -p assets/program/resource
 	mkdir -p assets/ure/share/misc assets/share/registry/res
+	mkdir -p assets/share/config/soffice.cfg
+# uno types & services
 	cp $(OUTDIR)/bin/types.rdb assets/program/types/
 	cp $(OUTDIR)/bin/ure/types.rdb assets/ure/share/misc/
 	cp $(OUTDIR)/xml/services.rdb assets/program/services
 	cp $(OUTDIR)/xml/ure/services.rdb assets/ure/share/misc/
+# config
 	cp -R $(OUTDIR)/xml/*.xcd assets/share/registry/
 	mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res/
+	cp -R $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg
+	cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config/images.zip
 # .res files
 	cp $(OUTDIR)/bin/*en-US.res assets/program/resource/
 # Then assets that are unpacked at run-time into the app's data directory.