README.md | 2
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 155
+++++++++-
ios/LibreOfficeLight/LibreOfficeLight/lokit.mm | 4
ios/loApp.xcconfig.in | 11
4 files changed, 161 insertions(+), 11 deletions(-)
New commits:
commit e45c4f68ed45856285abb88543a41496875d9566
Author: jan Iversen <j...@libreoffice.org>
Date: Sun Oct 8 12:33:33 2017 +0200
iOS, add simulator configuration to app
LibreOfficeLight can now be generated as:
Release (target arm64 == production)
Debug (target arm64 == debug on real hw)
Simulator (target x86_64 == debug in simulator)
Change-Id: I8742946571fb0268c9c83f32de5b6c0093624ebe
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index bb17d65ddccc..90196126a17b 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -509,6 +509,127 @@
};
name = Release;
};
+ 39ACF41A1F8A358000DA7334 /* Simulator */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 39ACF4181F8A317600DA7334
/* loApp.xcconfig */;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_NONNULL = YES;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+ 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_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_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Developer";
+ COPY_PHASE_STRIP = NO;
+ DEBUG_INFORMATION_FORMAT = dwarf;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ 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;
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+ "$(LO_BUILDDIR)/config_host",
+ "$(LO_SRCDIR)/include",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+ "$(LO_SRCDIR)/ios/generated",
+
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
+ );
+ "HEADER_SEARCH_PATHS[arch=*]" = (
+ "$(inherited)",
+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+ "$(LO_BUILDDIR)/config_host",
+ "$(LO_SRCDIR)/include",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+ "$(LO_SRCDIR)/ios/generated",
+
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
+ );
+ IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ MTL_ENABLE_DEBUG_INFO = YES;
+ ONLY_ACTIVE_ARCH = YES;
+ OTHER_LDFLAGS = (
+ "$(LINK_LDFLAGS)",
+ "-lstdc++",
+ );
+ SDKROOT = iphoneos;
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ TARGETED_DEVICE_FAMILY = "1,2";
+ VALID_ARCHS = "arm64 x86_64";
+ };
+ name = Simulator;
+ };
+ 39ACF41B1F8A358000DA7334 /* Simulator */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+ CLANG_WARN_INFINITE_RECURSION = NO;
+ CODE_SIGN_ENTITLEMENTS =
LibreOfficeLight/LibreOfficeLight.entitlements;
+ DEVELOPMENT_TEAM = TM977DU7EF;
+ ENABLE_TESTABILITY = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER =
"LibreOfficeLight/LibreOfficeLight-Prefix.pch";
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ "HEADER_SEARCH_PATHS[arch=*]" = (
+ "$(inherited)",
+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+ "$(LO_BUILDDIR)/config_host",
+ "$(LO_SRCDIR)/include",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
+ "$(LO_WORKDIR)/ios/generated",
+ );
+ INFOPLIST_FILE = LibreOfficeLight/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited)
@executable_path/Frameworks";
+ ONLY_ACTIVE_ARCH = NO;
+ OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
+ PRODUCT_BUNDLE_IDENTIFIER =
com.jani.Editors.LibreOfficeLight;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_OBJC_BRIDGING_HEADER =
"LibreOfficeLight/lokit-Bridging-Header.h";
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
+ TARGETED_DEVICE_FAMILY = 2;
+ VALID_ARCHS = "arm64 x86_64";
+ };
+ name = Simulator;
+ };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -516,19 +637,21 @@
isa = XCConfigurationList;
buildConfigurations = (
397E09231E597BD8001374E0 /* Debug */,
+ 39ACF41A1F8A358000DA7334 /* Simulator */,
397E09241E597BD8001374E0 /* Release */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
+ defaultConfigurationName = Simulator;
};
397E09251E597BD8001374E0 /* Build configuration list for
PBXNativeTarget "LibreOfficeLight" */ = {
isa = XCConfigurationList;
buildConfigurations = (
397E09261E597BD8001374E0 /* Debug */,
+ 39ACF41B1F8A358000DA7334 /* Simulator */,
397E09271E597BD8001374E0 /* Release */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
+ defaultConfigurationName = Simulator;
};
/* End XCConfigurationList section */
};
diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in
index dba31a09691d..fb3426dd4df8 100644
--- a/ios/loApp.xcconfig.in
+++ b/ios/loApp.xcconfig.in
@@ -14,3 +14,14 @@ OTHER_CFLAGS = @CFLAGS@
OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
SYMROOT = @SYMROOT@
+//:configuration = Debug
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a
+
+//:configuration = Release
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a
+
+//:configuration = Simulator
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a
+
+//:completeSettings = some
+
commit f0836b511f01beec873735185b21f7d2d6bd5095
Author: jan Iversen <j...@libreoffice.org>
Date: Sun Oct 8 12:17:49 2017 +0200
iOS, update app to swift 4
Preparing for iOS 11.0 and xCode 9.0
Change-Id: I9e7dc9b6c55bf5606eae859baa47fcd95fdc5ed8
diff --git a/README.md b/README.md
index bff77c676dbb..62deaffcbf27 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ run and compile LibreOffice, also used by the TDF builds:
* Build: GCC 4.8.1 or Clang
* iOS (only for LibreOfficeKit):
* Runtime: 10.3 (only support for newer i devices == 64 bit)
- * Build: Xcode 8.3 and iPhone SDK 10.3
+ * Build: Xcode 9.0 and iPhone SDK 10.3
If you want to use Clang with the LibreOffice compiler plugins, the minimal
version of Clang is 3.4. Since Xcode doesn't provide the compiler plugin
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 3480b02cffee..bb17d65ddccc 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -50,6 +50,7 @@
3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift;
name = DocumentController.swift; path =
LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; };
3992D85B1E5B764A00BEA987 /* SideMenu.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= SideMenu.swift; path = LibreOfficeLight/SideMenu.swift; sourceTree =
SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift;
sourceTree = SOURCE_ROOT; };
+ 39ACF4181F8A317600DA7334 /* loApp.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
loApp.xcconfig; path =
../../../../../../../Users/jani/lo_ios/workdir/ios/loApp.xcconfig; sourceTree =
"<group>"; };
39B084E51E5F0BB400682A59 /* fundamentalrc */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name =
fundamentalrc; path = ../generated/resources/fundamentalrc; sourceTree =
SOURCE_ROOT; };
39B084E61E5F0BB400682A59 /* offapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = offapi.rdb; path =
../generated/resources/offapi.rdb; sourceTree = SOURCE_ROOT; };
39B084E71E5F0BB400682A59 /* oovbaapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = oovbaapi.rdb; path =
../generated/resources/oovbaapi.rdb; sourceTree = SOURCE_ROOT; };
@@ -74,6 +75,7 @@
3911D89F1E5993600050D6BC /* Support files */ = {
isa = PBXGroup;
children = (
+ 39ACF4181F8A317600DA7334 /* loApp.xcconfig */,
39022C221EDC303200100066 /* InfoPlist.strings
*/,
39B092501E5F3DEA00682A59 /*
LibreOfficeLight-Prefix.pch */,
397275391E77D9F1006ACDCC /*
LibreOfficeLight.entitlements */,
@@ -171,13 +173,13 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
- LastUpgradeCheck = 0830;
+ LastUpgradeCheck = 0900;
ORGANIZATIONNAME = jani;
TargetAttributes = {
397E08F91E597BD8001374E0 = {
CreatedOnToolsVersion = 8.2;
DevelopmentTeam = TM977DU7EF;
- LastSwiftMigration = 0820;
+ LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.ApplicationGroups.iOS = {
@@ -284,6 +286,7 @@
/* Begin XCBuildConfiguration section */
397E09231E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39ACF4181F8A317600DA7334
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
@@ -291,7 +294,9 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -299,7 +304,11 @@
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_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_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -359,6 +368,7 @@
};
397E09241E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39ACF4181F8A317600DA7334
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
@@ -366,7 +376,9 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -374,7 +386,11 @@
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_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_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -429,7 +445,6 @@
397E09261E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -459,7 +474,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER =
"LibreOfficeLight/lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
};
@@ -468,7 +484,6 @@
397E09271E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -487,7 +502,8 @@
PRODUCT_BUNDLE_IDENTIFIER =
com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER =
"LibreOfficeLight/lokit-Bridging-Header.h";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
};
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
b/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
index 609493076cd4..e538b5fbce57 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
+++ b/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
@@ -20,8 +20,8 @@
// Force reference to libreofficekit_hook
-extern "C" __attribute__((used)) void *libreofficekit_hook(const char *);
-static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
+//extern "C" __attribute__((used)) void *libreofficekit_hook(const char *);
+//static __attribute__((used)) void *(*foop)(const char *) =
libreofficekit_hook;
// pointers to our instance
static LibreOfficeKit* kit;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
