android/qa/sc/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5ef52d43a308f8153c6f8ac5b07521080fdeb2db
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Fri Jan 20 22:39:17 2012 +0200
filters_test needs a shitload of components
Ugly duplication of the list if components. Could obviously do some
elegant refactoring to have each component mentioned just once. But on
the other hand, this is just a temporary way to build this unit test
app, no? If/when eventually gbuildifying this, the data from the
gb_CppunitTest_add_components calls in the correspondig
CppunitTest_FOO.mk files can be used, one hopes.
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 35e5acd..dbf9fb4 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -133,7 +133,7 @@ copy-stuff:
for F in xml/ure/services; do \
sed -e
's!uri="vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g'
<$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \
done
- for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml
configmgr/source/configmgr; do \
+ for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml
configmgr/source/configmgr basic/util/sb
chart2/source/controller/chartcontroller chart2/source/tools/charttools
chart2/source/model/chartmodel comphelper/util/comphelp dbaccess/util/dba
eventattacher/source/evtatt fileaccess/source/fileacc
filter/source/config/cache/filterconfig1 forms/util/frm oox/util/oox
package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap
sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt
scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot
svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl
unoxml/source/rdf/unordf; do \
mkdir -p assets/ComponentTarget/`dirname $$F`; \
sed -e
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g'
<$(WORKDIR)/ComponentTarget/$$F.component
>assets/ComponentTarget/$$F.component; \
done
@@ -168,12 +168,12 @@ uninstall:
adb uninstall $(APP_PACKAGE)
run_ucalc:
- echo "STAR_RESOURCEPATH=/assets/bin
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry'
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/ComponentTarget/framework/util/fwk.component
file:///assets/ComponentTarget/i18npool/util/i18npool.component
file:///assets/ComponentTarget/sfx2/util/sfx.component
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component
file:///assets/ComponentTarget/configmgr/source/configmgr.component
file:///assets/ComponentTarget/ucb/source/core/ucb1.component
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
+ echo "STAR_RESOURCEPATH=/assets/bin
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry'
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/ComponentTarget/framework/util/fwk.component
file:///assets/ComponentTarget/i18npool/util/i18npool.component
file:///assets/ComponentTarget/sfx2/util/sfx.component
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component
file:///assets/ComponentTarget/configmgr/source/configmgr.component
file:///assets/ComponentTarget/ucb/source/core/ucb1.component
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
adb push cmdline $(APP_DATA_PATH)/cmdline
adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library
libcppunittester -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
run_filters_test:
- echo "STAR_RESOURCEPATH=/assets/bin
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf
$(APP_DATA_PATH)/lib/libtest_sc_filters_test.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry
module:file:///assets/xml/registry/spool'
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/ComponentTarget/framework/util/fwk.component
file:///assets/ComponentTarget/i18npool/util/i18npool.component
file:///assets/ComponentTarget/sfx2/util/sfx.component
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component
file:///assets/ComponentTarget/configmgr/source/configmgr.component
file:///assets/ComponentTarget/ucb/source/core/ucb1.component
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PA
TH)/lib" >cmdline
+ echo "STAR_RESOURCEPATH=/assets/bin
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf
$(APP_DATA_PATH)/lib/libtest_sc_filters_test.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry
module:file:///assets/xml/registry/spool'
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/ComponentTarget/basic/util/sb.component
file:///assets/ComponentTarget/chart2/source/controller/chartcontroller.component
file:///assets/ComponentTarget/chart2/source/tools/charttools.component
file:///assets/ComponentTarget/chart2/source/model/chartmodel.component
file:///assets/ComponentTarget/comphelper/util/comphelp.component
file:///assets/ComponentTarget/dbaccess/util/dba.component
file:///assets/ComponentTarget/eventattacher/source/evtatt.component
file:///assets/ComponentTarget/fileaccess/source/fileacc.component
file:///assets/ComponentTarget/filter/source/config/cache/filterconfig1.component
file:///assets/ComponentTarget/forms/util/frm.component
file:///assets/ComponentTarget/oox/util/oox.component
file:///assets/ComponentTarget/package/source/xstor/xstor.component
file:///assets/ComponentTarget/package/util/package2.component
file:///assets/ComponentTarget/sax/source/expatwrap/expwrap.component
file:///assets/ComponentTarget/sax/source/fastparser/fastsax.component
file:///assets/ComponentTarget/sc/util/sc.component
file:///assets/ComponentTarget/sc/util/scfilt.component
file:///assets/ComponentTarget/scaddins/source/analysis/analysis.component
file:///assets/ComponentTarget/scaddins/source/datefunc/date.component
file:///assets/ComponentTarget/sot/util/sot.component
file:///assets/ComponentTarget/svl/util/svl.component
file:///assets/ComponentTarget/toolkit/util/tk.component
file:///assets/ComponentTarget/ucb/source/ucp/tdoc/ucptdoc1.component
file:///assets/ComponentTarget/unoto
ols/util/utl.component
file:///assets/ComponentTarget/unoxml/source/rdf/unordf.component
file:///assets/ComponentTarget/framework/util/fwk.component
file:///assets/ComponentTarget/i18npool/util/i18npool.component
file:///assets/ComponentTarget/sfx2/util/sfx.component
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component
file:///assets/ComponentTarget/configmgr/source/configmgr.component
file:///assets/ComponentTarget/ucb/source/core/ucb1.component
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
adb push cmdline $(APP_DATA_PATH)/cmdline
adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library
libcppunittester -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
