android/experimental/LibreOffice4Android/Makefile | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 09fa15193e98592b8d183e00dd3a1b7c9878b603
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Nov 22 14:41:36 2012 +0200
Simplify: Drop URE_MORE_TYPES and URE_MORE_SERVICES
Change-Id: Idf6b9763051b4ca2bb5c5c5e073cdae7abaf9df4
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index ea5fbeb..a33bd5a 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -80,15 +80,13 @@ copy-stuff:
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
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >>
assets/program/fundamentalrc
- echo 'URE_MORE_TYPES=$$APP_DATA_DIR/program/offapi.rdb
$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/fundamentalrc
- echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb
<$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc
+ echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway' >>
assets/program/fundamentalrc
#
# Set up unorc
echo '[Bootstrap]' > assets/program/unorc
echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/' >>
assets/program/unorc
- echo 'UNO_TYPES=$$APP_DATA_DIR/program/ure/types.rdb
$$APP_DATA_DIR/program/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc
- echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
$${URE_MORE_SERVICES}' >> assets/program/unorc
+ echo 'UNO_TYPES=$$APP_DATA_DIR/program/ure/types.rdb
$$APP_DATA_DIR/program/types.rdb $$APP_DATA_DIR/program/offapi.rdb
$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc
+ echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >>
assets/program/unorc
#
# Set up bootstraprc
echo '[Bootstrap]' > assets/program/bootstraprc
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
