ios/qa/sc/Makefile | 14 +++++++++++++- ios/qa/sc/filters-test.m | 14 ++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-)
New commits: commit 9148c703235527d863978e1e947cce060cf49ef9 Author: Tor Lillqvist <[email protected]> Date: Mon Aug 27 19:39:59 2012 +0300 Incomplete hacks on the iOS sc filters-test unit test Change-Id: I6b1f22d0623e8746af755dd25fc9f3194d6f11d3 diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index 4308132..8b2546f 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -60,6 +60,16 @@ stuff: ) >$(APPDIR)/fundamentalrc # +# An unorc is *mandatory*, sigh. We leave it empty except for the +# [Bootstrap} section header, though, and set all the stuff using +# -env: options in filters-test.m. Whether that makes sense or not, +# no idea. The ideal would clearly be if *none* of the various rc +# files was mandatory, and the code would automatically use sane +# defaults. (Sane for the particular platform, that is.) + ( \ + echo '[Bootstrap]' \ + ) >$(APPDIR)/unorc +# # hmm, once again, a hodgepodge of stuff, I don't really know which # files of which are actually needed... mkdir -p $(APPDIR)/registry/res @@ -69,9 +79,11 @@ stuff: # # .rdb files cp $(OUTDIR)/bin/udkapi.rdb $(OUTDIR)/bin/types.rdb $(OUTDIR)/xml/ure/services.rdb $(APPDIR) + mkdir -p $(APPDIR)/ure + cp $(OUTDIR)/bin/ure/types.rdb $(APPDIR)/ure # # a bunch of .component files - 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/chartcore comphelper/util/comphelp eventattacher/source/evtatt fileaccess/source/fileacc filter/source/config/cache/filterconfig1 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 \ + 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/chartcore comphelper/util/comphelp eventattacher/source/evtatt fileaccess/source/fileacc filter/source/config/cache/filterconfig1 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 $(APPDIR)/ComponentTarget/`dirname $$F`; \ cp $(WORKDIR)/ComponentTarget/$$F.component $(APPDIR)/ComponentTarget/$$F.component; \ done diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index df6afd3..9116464 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -119,7 +119,7 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions "--protector", "dummy-libunobootstrapprotector", "unobootstrapprotector", - "placeholder-ure-internal-lib-dir", + "-env:URE_INTERNAL_LIB_DIR=file:///", "placeholder-uno-types", "placeholder-uno-services" }; @@ -128,18 +128,20 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions NSString *app_root_escaped = [[[NSBundle mainBundle] bundlePath] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]; - argv[argc-3] = "-env:URE_INTERNAL_LIB_DIR=file:///"; - NSString *uno_types = @"-env:UNO_TYPES="; uno_types = [uno_types stringByAppendingString: @"file://"]; uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"udkapi.rdb"]]; uno_types = [uno_types stringByAppendingString: @" "]; - uno_types = [uno_types stringByAppendingString: @"file://"]; uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"types.rdb"]]; + uno_types = [uno_types stringByAppendingString: @" "]; + uno_types = [uno_types stringByAppendingString: @"file://"]; + uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"ure/types.rdb"]]; + + assert(strcmp(argv[argc-2], "placeholder-uno-types") == 0); argv[argc-2] = [uno_types UTF8String]; NSString *uno_services = @"-env:UNO_SERVICES="; @@ -148,8 +150,7 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions "services.rdb", "ComponentTarget/basic/util/sb.component", "ComponentTarget/chart2/source/controller/chartcontroller.component", - "ComponentTarget/chart2/source/tools/charttools.component", - "ComponentTarget/chart2/source/model/chartmodel.component", + "ComponentTarget/chart2/source/chartcore.component", "ComponentTarget/comphelper/util/comphelp.component", "ComponentTarget/eventattacher/source/evtatt.component", "ComponentTarget/fileaccess/source/fileacc.component", @@ -185,6 +186,7 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions uno_services = [uno_services stringByAppendingString: @" "]; } + assert(strcmp(argv[argc-1], "placeholder-uno-services") == 0); argv[argc-1] = [uno_services UTF8String]; lo_main(argc, argv); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
