mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We need also unobootstrapprotector now

Browse Source
This commit is contained in:
Tor Lillqvist
2012-04-16 01:35:30 +02:00
parent ae3f7ccaab
commit b20a10d5f8
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/qa/sc/Makefile
View File

@@ -39,7 +39,7 @@ SRCS = filters-test.m
CFLAGS = $(SOLARINC) 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 all: $(APPDIR)/$(APP) stuff

13
ios/qa/sc/filters-test.m
View File

@@ -108,11 +108,16 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
"--headless", "--headless",
"--protector", "--protector",
"dummy-libunoexceptionprotector", "dummy-libunoexceptionprotector",
"dummy-unoexceptionprotector", "unoexceptionprotector",
"--protector",
"dummy-libunobootstrapprotector",
"unobootstrapprotector",
"placeholder-uno-types", "placeholder-uno-types",
"placeholder-uno-services" "placeholder-uno-services"
}; };
const int argc = sizeof(argv)/sizeof(*argv);
NSString *app_root_escaped = [[[NSBundle mainBundle] bundlePath] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]; NSString *app_root_escaped = [[[NSBundle mainBundle] bundlePath] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
NSString *uno_types = @"-env:UNO_TYPES="; NSString *uno_types = @"-env:UNO_TYPES=";
@@ -125,7 +130,7 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
uno_types = [uno_types stringByAppendingString: @"file://"]; uno_types = [uno_types stringByAppendingString: @"file://"];
uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"types.rdb"]]; 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="; NSString *uno_services = @"-env:UNO_SERVICES=";
@@ -170,9 +175,9 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
uno_services = [uno_services stringByAppendingString: @" "]; 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]; [self.window makeKeyAndVisible];
return YES; return YES;