diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-04-16 01:35:30 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-04-16 01:46:38 +0200 |
commit | b20a10d5f845d0e4a4f21f360afd126c2cdacc4c (patch) | |
tree | 6c342960ac42b15d9d0aff7d9886ab1a364432ac /ios | |
parent | Recognize unoexceptionprotector and unobootstrapprotector (diff) | |
download | core-b20a10d5f845d0e4a4f21f360afd126c2cdacc4c.tar.gz core-b20a10d5f845d0e4a4f21f360afd126c2cdacc4c.zip |
We need also unobootstrapprotector now
Diffstat (limited to 'ios')
-rw-r--r-- | ios/qa/sc/Makefile | 2 | ||||
-rw-r--r-- | ios/qa/sc/filters-test.m | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index d674098d72d1..ea3440f1e06c 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -39,7 +39,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/i18npool.uno lib/stocservices.uno lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc +LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/i18npool.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licudata -licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc all: $(APPDIR)/$(APP) stuff diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index 42b0816b1430..be329249b43b 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -108,11 +108,16 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions "--headless", "--protector", "dummy-libunoexceptionprotector", - "dummy-unoexceptionprotector", + "unoexceptionprotector", + "--protector", + "dummy-libunobootstrapprotector", + "unobootstrapprotector", "placeholder-uno-types", "placeholder-uno-services" }; + const int argc = sizeof(argv)/sizeof(*argv); + NSString *app_root_escaped = [[[NSBundle mainBundle] bundlePath] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]; NSString *uno_types = @"-env:UNO_TYPES="; @@ -125,7 +130,7 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions uno_types = [uno_types stringByAppendingString: @"file://"]; uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"types.rdb"]]; - argv[6] = [uno_types UTF8String]; + argv[argc-2] = [uno_types UTF8String]; NSString *uno_services = @"-env:UNO_SERVICES="; @@ -170,9 +175,9 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions uno_services = [uno_services stringByAppendingString: @" "]; } - argv[7] = [uno_services UTF8String]; + argv[argc-1] = [uno_services UTF8String]; - lo_main(sizeof(argv)/sizeof(*argv), argv); + lo_main(argc, argv); [self.window makeKeyAndVisible]; return YES; |