ios/CustomTarget_iOS_setup.mk | 11
ios/UnitTest/UnitTest.xcodeproj/project.pbxproj | 470 ++++++++++++++++++++++++
ios/UnitTest/UnitTest/AppDelegate.h | 16
ios/UnitTest/UnitTest/AppDelegate.m | 52 ++
ios/UnitTest/UnitTest/Info.plist | 45 ++
ios/UnitTest/UnitTest/ViewController.h | 14
ios/UnitTest/UnitTest/ViewController.mm | 75 +++
ios/UnitTest/UnitTest/main.m | 18
libreofficekit/qa/tilebench/tilebench.cxx | 16
9 files changed, 705 insertions(+), 12 deletions(-)
New commits:
commit 68de1021353902d48ddd712f5e6fedc51c57936d
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Sep 27 18:08:07 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Sep 28 14:03:05 2018 +0200
Start on the iOS unit test app
Change-Id: Idef0b375d5c7d6d4542aee1f8abecaf9f834189c
Reviewed-on: https://gerrit.libreoffice.org/61058
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 3f6f5eac90ac..df94b4ef2688 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -21,8 +21,7 @@ IOSDIRS = $(IOSGEN) \
$(IOSRES)/program \
$(IOSRES)/share \
$(IOSRES)/config \
- $(IOSRES)/filter \
- $(WORKDIR)/ios
+ $(IOSRES)/filter
#- Top level -----------------------------------------------------------------
@@ -41,13 +40,10 @@ $(IOSDIRS):
$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
$(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
$(SRCDIR)/solenv/bin/native-code.py \
- $(IOSGEN) $(WORKDIR)/ios \
+ $(IOSGEN) \
$(IOSDIRS)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),EN2,2)
- # Secure LibreOffice.c get build if there are changes
- rm -rf $(WORKDIR)/ios/*
-
# generate native-code.h (used by LibreOffice.c)
$(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
@@ -111,7 +107,6 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
#- clean ios -----------------------------------------------------------------
$(call gb_CustomTarget_get_clean_target,ios/iOS_setup):
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
- rm -rf $(IOSRES)/* $(IOSGEN)/native-code.h $(IOSGEN)/build
- rm -rf $(WORKDIR)/ios
+ rm -rf $(IOSRES)/* $(IOSGEN)/native-code.h $(IOSGEN)
# vim: set noet sw=4 ts=4:
diff --git a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
new file mode 100644
index 000000000000..8a49473ded43
--- /dev/null
+++ b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
@@ -0,0 +1,470 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 50;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ BE39ADD7215D5470000B0244 /* test.odt in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADD6215D5470000B0244 /* test.odt */; };
+ BE39ADEF215D5AA4000B0244 /* icudt62l.dat in Resources */ = {isa
= PBXBuildFile; fileRef = BE39ADE0215D5AA3000B0244 /* icudt62l.dat */; };
+ BE39ADF0215D5AA4000B0244 /* fundamentalrc in Resources */ =
{isa = PBXBuildFile; fileRef = BE39ADE1215D5AA3000B0244 /* fundamentalrc */; };
+ BE39ADF1215D5AA4000B0244 /* services in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADE2215D5AA3000B0244 /* services */; };
+ BE39ADF2215D5AA4000B0244 /* share in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADE3215D5AA3000B0244 /* share */; };
+ BE39ADF3215D5AA4000B0244 /* oovbaapi.rdb in Resources */ = {isa
= PBXBuildFile; fileRef = BE39ADE4215D5AA3000B0244 /* oovbaapi.rdb */; };
+ BE39ADF4215D5AA4000B0244 /* program in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADE5215D5AA3000B0244 /* program */; };
+ BE39ADF5215D5AA4000B0244 /* config in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADE6215D5AA3000B0244 /* config */; };
+ BE39ADF6215D5AA4000B0244 /* services.rdb in Resources */ = {isa
= PBXBuildFile; fileRef = BE39ADE7215D5AA3000B0244 /* services.rdb */; };
+ BE39ADF7215D5AA4000B0244 /* registry in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADE8215D5AA3000B0244 /* registry */; };
+ BE39ADF8215D5AA4000B0244 /* offapi.rdb in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADE9215D5AA3000B0244 /* offapi.rdb */; };
+ BE39ADF9215D5AA4000B0244 /* udkapi.rdb in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADEA215D5AA3000B0244 /* udkapi.rdb */; };
+ BE39ADFA215D5AA4000B0244 /* rc in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADEB215D5AA3000B0244 /* rc */; };
+ BE39ADFB215D5AA4000B0244 /* filter in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADEC215D5AA3000B0244 /* filter */; };
+ BE39ADFC215D5AA4000B0244 /* unorc in Resources */ = {isa =
PBXBuildFile; fileRef = BE39ADED215D5AA4000B0244 /* unorc */; };
+ BE39ADFD215D5AA4000B0244 /* welcome.odt in Resources */ = {isa
= PBXBuildFile; fileRef = BE39ADEE215D5AA4000B0244 /* welcome.odt */; };
+ BE535616215D189A0068B3B7 /* AppDelegate.m in Sources */ = {isa
= PBXBuildFile; fileRef = BE535615215D189A0068B3B7 /* AppDelegate.m */; };
+ BE535619215D189A0068B3B7 /* ViewController.mm in Sources */ =
{isa = PBXBuildFile; fileRef = BE535618215D189A0068B3B7 /* ViewController.mm
*/; };
+ BE53561C215D189A0068B3B7 /* Main.storyboard in Resources */ =
{isa = PBXBuildFile; fileRef = BE53561A215D189A0068B3B7 /* Main.storyboard */;
};
+ BE53561E215D189E0068B3B7 /* Assets.xcassets in Resources */ =
{isa = PBXBuildFile; fileRef = BE53561D215D189E0068B3B7 /* Assets.xcassets */;
};
+ BE535621215D189E0068B3B7 /* LaunchScreen.storyboard in
Resources */ = {isa = PBXBuildFile; fileRef = BE53561F215D189E0068B3B7 /*
LaunchScreen.storyboard */; };
+ BE535624215D189E0068B3B7 /* main.m in Sources */ = {isa =
PBXBuildFile; fileRef = BE535623215D189E0068B3B7 /* main.m */; };
+ BEA1A6FE215D1D9700A9323B /* libz.tbd in Frameworks */ = {isa =
PBXBuildFile; fileRef = BEA1A6FD215D1D9700A9323B /* libz.tbd */; };
+ BEA1A700215D1D9F00A9323B /* libiconv.tbd in Frameworks */ =
{isa = PBXBuildFile; fileRef = BEA1A6FF215D1D9F00A9323B /* libiconv.tbd */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ BE39ADD6215D5470000B0244 /* test.odt */ = {isa =
PBXFileReference; lastKnownFileType = file; name = test.odt; path =
../../../../odk/examples/cpp/DocumentLoader/test.odt; sourceTree = "<group>"; };
+ BE39ADE0215D5AA3000B0244 /* icudt62l.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = icudt62l.dat; path =
../../../../workdir/CustomTarget/ios/resources/icudt62l.dat; sourceTree =
"<group>"; };
+ BE39ADE1215D5AA3000B0244 /* fundamentalrc */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name =
fundamentalrc; path =
../../../../workdir/CustomTarget/ios/resources/fundamentalrc; sourceTree =
"<group>"; };
+ BE39ADE2215D5AA3000B0244 /* services */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = services; path =
../../../../workdir/CustomTarget/ios/resources/services; sourceTree =
"<group>"; };
+ BE39ADE3215D5AA3000B0244 /* share */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = share; path =
../../../../workdir/CustomTarget/ios/resources/share; sourceTree = "<group>"; };
+ BE39ADE4215D5AA3000B0244 /* oovbaapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = oovbaapi.rdb; path =
../../../../workdir/CustomTarget/ios/resources/oovbaapi.rdb; sourceTree =
"<group>"; };
+ BE39ADE5215D5AA3000B0244 /* program */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = program; path =
../../../../workdir/CustomTarget/ios/resources/program; sourceTree = "<group>";
};
+ BE39ADE6215D5AA3000B0244 /* config */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = config; path =
../../../../workdir/CustomTarget/ios/resources/config; sourceTree = "<group>";
};
+ BE39ADE7215D5AA3000B0244 /* services.rdb */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name =
services.rdb; path =
../../../../workdir/CustomTarget/ios/resources/services.rdb; sourceTree =
"<group>"; };
+ BE39ADE8215D5AA3000B0244 /* registry */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = registry; path =
../../../../workdir/CustomTarget/ios/resources/registry; sourceTree =
"<group>"; };
+ BE39ADE9215D5AA3000B0244 /* offapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = offapi.rdb; path =
../../../../workdir/CustomTarget/ios/resources/offapi.rdb; sourceTree =
"<group>"; };
+ BE39ADEA215D5AA3000B0244 /* udkapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = udkapi.rdb; path =
../../../../workdir/CustomTarget/ios/resources/udkapi.rdb; sourceTree =
"<group>"; };
+ BE39ADEB215D5AA3000B0244 /* rc */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = rc; path =
../../../../workdir/CustomTarget/ios/resources/rc; sourceTree = "<group>"; };
+ BE39ADEC215D5AA3000B0244 /* filter */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = filter; path =
../../../../workdir/CustomTarget/ios/resources/filter; sourceTree = "<group>";
};
+ BE39ADED215D5AA4000B0244 /* unorc */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = unorc; path =
../../../../workdir/CustomTarget/ios/resources/unorc; sourceTree = "<group>"; };
+ BE39ADEE215D5AA4000B0244 /* welcome.odt */ = {isa =
PBXFileReference; lastKnownFileType = file; name = welcome.odt; path =
../../../../workdir/CustomTarget/ios/resources/welcome.odt; sourceTree =
"<group>"; };
+ BE535611215D189A0068B3B7 /* UnitTest.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = UnitTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ BE535614215D189A0068B3B7 /* AppDelegate.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h;
sourceTree = "<group>"; };
+ BE535615215D189A0068B3B7 /* AppDelegate.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m;
sourceTree = "<group>"; };
+ BE535617215D189A0068B3B7 /* ViewController.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h;
sourceTree = "<group>"; };
+ BE535618215D189A0068B3B7 /* ViewController.mm */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path =
ViewController.mm; sourceTree = "<group>"; };
+ BE53561B215D189A0068B3B7 /* Base */ = {isa = PBXFileReference;
lastKnownFileType = file.storyboard; name = Base; path =
Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+ BE53561D215D189E0068B3B7 /* Assets.xcassets */ = {isa =
PBXFileReference; lastKnownFileType = folder.assetcatalog; path =
Assets.xcassets; sourceTree = "<group>"; };
+ BE535620215D189E0068B3B7 /* Base */ = {isa = PBXFileReference;
lastKnownFileType = file.storyboard; name = Base; path =
Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+ BE535622215D189E0068B3B7 /* Info.plist */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist;
sourceTree = "<group>"; };
+ BE535623215D189E0068B3B7 /* main.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m;
sourceTree = "<group>"; };
+ BEA1A6FD215D1D9700A9323B /* libz.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+ BEA1A6FF215D1D9F00A9323B /* libiconv.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ BE53560E215D189A0068B3B7 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ BEA1A700215D1D9F00A9323B /* libiconv.tbd in
Frameworks */,
+ BEA1A6FE215D1D9700A9323B /* libz.tbd in
Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ BE39ADD5215D5448000B0244 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ BE39ADE6215D5AA3000B0244 /* config */,
+ BE39ADEC215D5AA3000B0244 /* filter */,
+ BE39ADE1215D5AA3000B0244 /* fundamentalrc */,
+ BE39ADE0215D5AA3000B0244 /* icudt62l.dat */,
+ BE39ADE9215D5AA3000B0244 /* offapi.rdb */,
+ BE39ADE4215D5AA3000B0244 /* oovbaapi.rdb */,
+ BE39ADE5215D5AA3000B0244 /* program */,
+ BE39ADEB215D5AA3000B0244 /* rc */,
+ BE39ADE8215D5AA3000B0244 /* registry */,
+ BE39ADE2215D5AA3000B0244 /* services */,
+ BE39ADE7215D5AA3000B0244 /* services.rdb */,
+ BE39ADE3215D5AA3000B0244 /* share */,
+ BE39ADEA215D5AA3000B0244 /* udkapi.rdb */,
+ BE39ADED215D5AA4000B0244 /* unorc */,
+ BE39ADEE215D5AA4000B0244 /* welcome.odt */,
+ BE39ADD6215D5470000B0244 /* test.odt */,
+ );
+ path = Resources;
+ sourceTree = "<group>";
+ };
+ BE535608215D189A0068B3B7 = {
+ isa = PBXGroup;
+ children = (
+ BE535613215D189A0068B3B7 /* UnitTest */,
+ BE535612215D189A0068B3B7 /* Products */,
+ BEA1A6FC215D1D9700A9323B /* Frameworks */,
+ );
+ sourceTree = "<group>";
+ };
+ BE535612215D189A0068B3B7 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ BE535611215D189A0068B3B7 /* UnitTest.app */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ BE535613215D189A0068B3B7 /* UnitTest */ = {
+ isa = PBXGroup;
+ children = (
+ BE39ADD5215D5448000B0244 /* Resources */,
+ BE535614215D189A0068B3B7 /* AppDelegate.h */,
+ BE535615215D189A0068B3B7 /* AppDelegate.m */,
+ BE535617215D189A0068B3B7 /* ViewController.h */,
+ BE535618215D189A0068B3B7 /* ViewController.mm
*/,
+ BE53561A215D189A0068B3B7 /* Main.storyboard */,
+ BE53561D215D189E0068B3B7 /* Assets.xcassets */,
+ BE53561F215D189E0068B3B7 /*
LaunchScreen.storyboard */,
+ BE535622215D189E0068B3B7 /* Info.plist */,
+ BE535623215D189E0068B3B7 /* main.m */,
+ );
+ path = UnitTest;
+ sourceTree = "<group>";
+ };
+ BEA1A6FC215D1D9700A9323B /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ BEA1A6FF215D1D9F00A9323B /* libiconv.tbd */,
+ BEA1A6FD215D1D9700A9323B /* libz.tbd */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ BE535610215D189A0068B3B7 /* UnitTest */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = BE535627215D189E0068B3B7 /*
Build configuration list for PBXNativeTarget "UnitTest" */;
+ buildPhases = (
+ BE53560D215D189A0068B3B7 /* Sources */,
+ BE53560E215D189A0068B3B7 /* Frameworks */,
+ BE53560F215D189A0068B3B7 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = UnitTest;
+ productName = UnitTest;
+ productReference = BE535611215D189A0068B3B7 /*
UnitTest.app */;
+ productType = "com.apple.product-type.application";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ BE535609215D189A0068B3B7 /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 1000;
+ ORGANIZATIONNAME = "Tor Lillqvist";
+ TargetAttributes = {
+ BE535610215D189A0068B3B7 = {
+ CreatedOnToolsVersion = 10.0;
+ };
+ };
+ };
+ buildConfigurationList = BE53560C215D189A0068B3B7 /*
Build configuration list for PBXProject "UnitTest" */;
+ compatibilityVersion = "Xcode 9.3";
+ developmentRegion = en;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ Base,
+ );
+ mainGroup = BE535608215D189A0068B3B7;
+ productRefGroup = BE535612215D189A0068B3B7 /* Products
*/;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ BE535610215D189A0068B3B7 /* UnitTest */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ BE53560F215D189A0068B3B7 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ BE39ADEF215D5AA4000B0244 /* icudt62l.dat in
Resources */,
+ BE39ADF7215D5AA4000B0244 /* registry in
Resources */,
+ BE39ADF6215D5AA4000B0244 /* services.rdb in
Resources */,
+ BE39ADF3215D5AA4000B0244 /* oovbaapi.rdb in
Resources */,
+ BE39ADF8215D5AA4000B0244 /* offapi.rdb in
Resources */,
+ BE535621215D189E0068B3B7 /*
LaunchScreen.storyboard in Resources */,
+ BE39ADFB215D5AA4000B0244 /* filter in Resources
*/,
+ BE39ADF4215D5AA4000B0244 /* program in
Resources */,
+ BE39ADF5215D5AA4000B0244 /* config in Resources
*/,
+ BE39ADD7215D5470000B0244 /* test.odt in
Resources */,
+ BE39ADFA215D5AA4000B0244 /* rc in Resources */,
+ BE39ADF2215D5AA4000B0244 /* share in Resources
*/,
+ BE39ADFD215D5AA4000B0244 /* welcome.odt in
Resources */,
+ BE53561E215D189E0068B3B7 /* Assets.xcassets in
Resources */,
+ BE39ADF1215D5AA4000B0244 /* services in
Resources */,
+ BE39ADFC215D5AA4000B0244 /* unorc in Resources
*/,
+ BE53561C215D189A0068B3B7 /* Main.storyboard in
Resources */,
+ BE39ADF9215D5AA4000B0244 /* udkapi.rdb in
Resources */,
+ BE39ADF0215D5AA4000B0244 /* fundamentalrc in
Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ BE53560D215D189A0068B3B7 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ BE535619215D189A0068B3B7 /* ViewController.mm
in Sources */,
+ BE535624215D189E0068B3B7 /* main.m in Sources
*/,
+ BE535616215D189A0068B3B7 /* AppDelegate.m in
Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+ BE53561A215D189A0068B3B7 /* Main.storyboard */ = {
+ isa = PBXVariantGroup;
+ children = (
+ BE53561B215D189A0068B3B7 /* Base */,
+ );
+ name = Main.storyboard;
+ sourceTree = "<group>";
+ };
+ BE53561F215D189E0068B3B7 /* LaunchScreen.storyboard */ = {
+ isa = PBXVariantGroup;
+ children = (
+ BE535620215D189E0068B3B7 /* Base */,
+ );
+ name = LaunchScreen.storyboard;
+ sourceTree = "<group>";
+ };
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+ BE535625215D189E0068B3B7 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_NONNULL = YES;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION =
YES_AGGRESSIVE;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS =
YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNGUARDED_AVAILABILITY =
YES_AGGRESSIVE;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ COPY_PHASE_STRIP = NO;
+ DEBUG_INFORMATION_FORMAT = dwarf;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu11;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+ MTL_FAST_MATH = YES;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = iphoneos;
+ };
+ name = Debug;
+ };
+ BE535626215D189E0068B3B7 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_NONNULL = YES;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION =
YES_AGGRESSIVE;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS =
YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNGUARDED_AVAILABILITY =
YES_AGGRESSIVE;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ COPY_PHASE_STRIP = NO;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ ENABLE_NS_ASSERTIONS = NO;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu11;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ MTL_ENABLE_DEBUG_INFO = NO;
+ MTL_FAST_MATH = YES;
+ SDKROOT = iphoneos;
+ VALIDATE_PRODUCT = YES;
+ };
+ name = Release;
+ };
+ BE535628215D189E0068B3B7 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CODE_SIGN_STYLE = Automatic;
+ DEVELOPMENT_TEAM = J4FQ687VJK;
+ ENABLE_BITCODE = NO;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "DISABLE_DYNLOADING=1",
+ "LIBO_INTERNAL_ONLY=1",
+ "IOS=IOS",
+ "$(inherited)",
+ );
+ HEADER_SEARCH_PATHS = (
+ ../../include,
+ ../../config_host,
+
../../workdir/UnoApiHeadersTarget/udkapi/comprehensive,
+
../../workdir/UnoApiHeadersTarget/offapi/comprehensive,
+ ../../workdir/CustomTarget/ios,
+
../../workdir/UnpackedTarball/cppunit/include,
+ ../../workdir/UnpackedTarball/boost,
+ );
+ INFOPLIST_FILE = UnitTest/Info.plist;
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
+ OTHER_LDFLAGS = (
+ "-filelist",
+
"../../workdir/CustomTarget/ios/ios-all-static-libs.list",
+ );
+ PRODUCT_BUNDLE_IDENTIFIER =
org.libreoffice.ios.UnitTest;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ TARGETED_DEVICE_FAMILY = "1,2";
+ };
+ name = Debug;
+ };
+ BE535629215D189E0068B3B7 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CODE_SIGN_STYLE = Automatic;
+ DEVELOPMENT_TEAM = J4FQ687VJK;
+ ENABLE_BITCODE = NO;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "IOS=IOS",
+ "DISABLE_DYNLOADING=1",
+ "LIBO_INTERNAL_ONLY=1",
+ );
+ HEADER_SEARCH_PATHS = (
+ ../../include,
+ ../../config_host,
+
../../workdir/UnoApiHeadersTarget/udkapi/comprehensive,
+
../../workdir/UnoApiHeadersTarget/offapi/comprehensive,
+ ../../workdir/CustomTarget/ios,
+
../../workdir/UnpackedTarball/cppunit/include,
+ ../../workdir/UnpackedTarball/boost,
+ );
+ INFOPLIST_FILE = UnitTest/Info.plist;
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
+ OTHER_LDFLAGS = (
+ "-filelist",
+
"../../workdir/CustomTarget/ios/ios-all-static-libs.list",
+ );
+ PRODUCT_BUNDLE_IDENTIFIER =
org.libreoffice.ios.UnitTest;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ TARGETED_DEVICE_FAMILY = "1,2";
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ BE53560C215D189A0068B3B7 /* Build configuration list for
PBXProject "UnitTest" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ BE535625215D189E0068B3B7 /* Debug */,
+ BE535626215D189E0068B3B7 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ BE535627215D189E0068B3B7 /* Build configuration list for
PBXNativeTarget "UnitTest" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ BE535628215D189E0068B3B7 /* Debug */,
+ BE535629215D189E0068B3B7 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = BE535609215D189A0068B3B7 /* Project object */;
+}
diff --git a/ios/UnitTest/UnitTest/AppDelegate.h
b/ios/UnitTest/UnitTest/AppDelegate.h
new file mode 100644
index 000000000000..a0f962c9a43e
--- /dev/null
+++ b/ios/UnitTest/UnitTest/AppDelegate.h
@@ -0,0 +1,16 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property(strong, nonatomic) UIWindow* window;
+
+@end
diff --git a/ios/UnitTest/UnitTest/AppDelegate.m
b/ios/UnitTest/UnitTest/AppDelegate.m
new file mode 100644
index 000000000000..56616ee77a15
--- /dev/null
+++ b/ios/UnitTest/UnitTest/AppDelegate.m
@@ -0,0 +1,52 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#import "AppDelegate.h"
+
+@interface AppDelegate ()
+
+@end
+
+@implementation AppDelegate
+
+
+- (BOOL)application:(UIApplication *)application
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+ // Override point for customization after application launch.
+ return YES;
+}
+
+
+- (void)applicationWillResignActive:(UIApplication *)application {
+ // Sent when the application is about to move from active to inactive
state. This can occur for certain types of temporary interruptions (such as an
incoming phone call or SMS message) or when the user quits the application and
it begins the transition to the background state.
+ // Use this method to pause ongoing tasks, disable timers, and invalidate
graphics rendering callbacks. Games should use this method to pause the game.
+}
+
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+ // Use this method to release shared resources, save user data, invalidate
timers, and store enough application state information to restore your
application to its current state in case it is terminated later.
+ // If your application supports background execution, this method is
called instead of applicationWillTerminate: when the user quits.
+}
+
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+ // Called as part of the transition from the background to the active
state; here you can undo many of the changes made on entering the background.
+}
+
+
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+ // Restart any tasks that were paused (or not yet started) while the
application was inactive. If the application was previously in the background,
optionally refresh the user interface.
+}
+
+
+- (void)applicationWillTerminate:(UIApplication *)application {
+ // Called when the application is about to terminate. Save data if
appropriate. See also applicationDidEnterBackground:.
+}
+
+
+@end
diff --git a/ios/UnitTest/UnitTest/Info.plist b/ios/UnitTest/UnitTest/Info.plist
new file mode 100644
index 000000000000..16be3b681122
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Info.plist
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
+ <key>UIMainStoryboardFile</key>
+ <string>Main</string>
+ <key>UIRequiredDeviceCapabilities</key>
+ <array>
+ <string>armv7</string>
+ </array>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>UISupportedInterfaceOrientations~ipad</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+</dict>
+</plist>
diff --git a/ios/UnitTest/UnitTest/ViewController.h
b/ios/UnitTest/UnitTest/ViewController.h
new file mode 100644
index 000000000000..5fb87137038f
--- /dev/null
+++ b/ios/UnitTest/UnitTest/ViewController.h
@@ -0,0 +1,14 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface ViewController : UIViewController
+
+@end
diff --git a/ios/UnitTest/UnitTest/ViewController.mm
b/ios/UnitTest/UnitTest/ViewController.mm
new file mode 100644
index 000000000000..0b25baf6ae0a
--- /dev/null
+++ b/ios/UnitTest/UnitTest/ViewController.mm
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <cassert>
+#include <iostream>
+
+#include <sal/config.h>
+
+#include <cppuhelper/exc_hlp.hxx>
+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
+#include <com/sun/star/uno/Any.hxx>
+
+#include <cppunit/CompilerOutputter.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/TestRunner.h>
+#include <cppunit/TextTestProgressListener.h>
+
+#import <LibreOfficeKit/LibreOfficeKit.hxx>
+
+extern "C" {
+#import <native-code.h>
+}
+
+#include <premac.h>
+#import "ViewController.h"
+#include <postmac.h>
+
+@interface ViewController ()
+
+@end
+
+#define CPPUNIT_PLUGIN_EXPORTED_NAME CppuMisc
+#include "../../../cppuhelper/qa/misc/test_misc.cxx"
+
+#undef CPPUNIT_PLUGIN_EXPORTED_NAME
+#define CPPUNIT_PLUGIN_EXPORTED_NAME CppuUnourl
+#include "../../../cppuhelper/qa/unourl/cppu_unourl.cxx"
+
+#define main tilebench_main
+#include "../../../libreofficekit/qa/tilebench/tilebench.cxx"
+
+@implementation ViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ // First run some normal cppunit tests
+
+ CppUnit::TestResult result;
+
+ CppUnit::TextTestProgressListener logger;
+ result.addListener(&logger);
+
+ CppUnit::TestResultCollector collector;
+ result.addListener(&collector);
+
+ CppUnit::TestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ runner.run(result);
+
+ CppUnit::CompilerOutputter outputter(&collector, std::cerr);
+ outputter.write();
+
+ // Then some more specific stuff
+ tilebench_main(0, nullptr);
+}
+
+@end
diff --git a/ios/UnitTest/UnitTest/main.m b/ios/UnitTest/UnitTest/main.m
new file mode 100644
index 000000000000..abfad3715806
--- /dev/null
+++ b/ios/UnitTest/UnitTest/main.m
@@ -0,0 +1,18 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+
+#import <UIKit/UIKit.h>
+#import "AppDelegate.h"
+
+int main(int argc, char * argv[]) {
+ @autoreleasepool {
+ return UIApplicationMain(argc, argv, nil,
NSStringFromClass([AppDelegate class]));
+ }
+}
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx
b/libreofficekit/qa/tilebench/tilebench.cxx
index 60a856212c5d..d4148dfaa797 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -286,12 +286,13 @@ static void testDialog( Document *pDocument, const char
*uno_cmd )
int main( int argc, char* argv[] )
{
- int arg;
+ int arg = 2;
+ origin = getTimeNow();
+#ifndef IOS
// avoid X oddness etc.
unsetenv("DISPLAY");
- origin = getTimeNow();
if( argc < 4 ||
( argc > 1 && ( !strcmp( argv[1], "--help" ) || !strcmp( argv[1], "-h"
) ) ) )
return help();
@@ -302,7 +303,6 @@ int main( int argc, char* argv[] )
return 1;
}
- arg = 2;
const char *doc_url = argv[arg++];
const char *mode = argv[arg++];
@@ -325,10 +325,18 @@ int main( int argc, char* argv[] )
lok_preinit(argv[1], user_url.c_str());
aTimes.emplace_back();
}
+ const char *install_path = argv[1];
+ const char *user_profile = user_url.c_str();
+#else
+ const char *install_path = nullptr;
+ const char *user_profile = nullptr;
+ const char *doc_url = strdup([[[[[NSBundle mainBundle] bundleURL]
absoluteString] stringByAppendingString:@"/test.odt"] UTF8String]);
+ const char *mode = "--tile";
+#endif
aTimes.emplace_back("initialization");
// coverity[tainted_string] - build time test tool
- Office *pOffice = lok_cpp_init(argv[1], user_url.c_str());
+ Office *pOffice = lok_cpp_init(install_path, user_profile);
if (pOffice == nullptr)
{
fprintf(stderr, "Failed to initialize Office from %s\n", argv[1]);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
