[Libreoffice-commits] core.git: 3 commits - ios/CustomTarget_iOS_prelink.mk ios/LibreOfficeLight ios/README
jan Iversen
jani at libreoffice.org
Sat Nov 25 11:25:43 UTC 2017
ios/CustomTarget_iOS_prelink.mk | 4
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 123 ++--------
ios/LibreOfficeLight/LibreOfficeLight/Info.plist | 2
ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c | 14 +
ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h | 2
ios/README | 13 -
6 files changed, 48 insertions(+), 110 deletions(-)
New commits:
commit ff92dc75a7d8c5981503eebac84ceaf33e36845b
Author: jan Iversen <jani at libreoffice.org>
Date: Sat Nov 25 12:23:58 2017 +0100
iOS, project update to compile with dummy LOkit
Change-Id: If76f4aaecb853db6b33d671092b7806bbb9b9d2d
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index ec9151c4acae..becd7212d156 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
+ 396C83371FC989AB008E662A /* dummyLOkit.c in Sources */ = {isa = PBXBuildFile; fileRef = 39284DB01FA5E150006F43E4 /* dummyLOkit.c */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; };
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; };
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift */; };
@@ -267,6 +268,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 396C83371FC989AB008E662A /* dummyLOkit.c in Sources */,
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */,
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */,
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */,
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c b/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
index 5d6effbf9647..309d00506cf3 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
+++ b/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
@@ -48,3 +48,17 @@ int BridgeLOkit_LeaveHipernate()
{
return 0;
}
+
+
+
+int BridgeLOkit_Sizing(const int countXtiles, const int countYtiles,
+ const int pixelsXtile, const int pixelsYtile)
+{
+ (void)countXtiles;
+ (void)countYtiles;
+ (void)pixelsXtile;
+ (void)pixelsYtile;
+ return 0;
+}
+
+
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h b/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
index 0ddc877b0233..d501ae863444 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
+++ b/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
@@ -10,4 +10,4 @@
// LibreOfficeKit is a prelink of all used LO libraries, generated
// as its own xCode project.
-#import "../LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h"
+#import "../../source/LibreOfficeKit.h"
commit 64c93f3fe939642acd4133ac5bbdeb91975b7662
Author: jan Iversen <jani at libreoffice.org>
Date: Sat Nov 25 12:16:39 2017 +0100
iOS, update app project
Updated LibreOfficeLight to correspond to new prelink.
Change-Id: Iec0425d3516849afaae4b640e8b4fc733430d595
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 2c96313d6c4d..ec9151c4acae 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -18,7 +18,6 @@
39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; };
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; };
- 397A4C3C1FC574A100566B54 /* loApp.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 397A4C3B1FC574A100566B54 /* loApp.xcconfig */; };
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift */; };
397E09031E597BD8001374E0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 397E09011E597BD8001374E0 /* Main.storyboard */; };
397E09081E597BD8001374E0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 397E09071E597BD8001374E0 /* Assets.xcassets */; };
@@ -31,6 +30,7 @@
39B08BD91E5F0BB600682A59 /* services.rdb in Resources */ = {isa = PBXBuildFile; fileRef = 39B085241E5F0BB400682A59 /* services.rdb */; };
39B091CD1E5F0BB800682A59 /* udkapi.rdb in Resources */ = {isa = PBXBuildFile; fileRef = 39B08B9B1E5F0BB600682A59 /* udkapi.rdb */; };
39B091CE1E5F0BB800682A59 /* unorc in Resources */ = {isa = PBXBuildFile; fileRef = 39B08B9C1E5F0BB600682A59 /* unorc */; };
+ 39E950531FC9842000D82C49 /* source in Resources */ = {isa = PBXBuildFile; fileRef = 39E950521FC9842000D82C49 /* source */; };
39EF4E2F1FA500C9001914AC /* PropertiesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39EF4E2E1FA500C9001914AC /* PropertiesController.swift */; };
/* End PBXBuildFile section */
@@ -39,7 +39,6 @@
39022C1C1EDC2A2C00100066 /* services */ = {isa = PBXFileReference; lastKnownFileType = folder; name = services; path = ../generated/resources/services; sourceTree = "<group>"; };
39022C1E1EDC2AB000100066 /* share */ = {isa = PBXFileReference; lastKnownFileType = folder; name = share; path = ../generated/resources/share; sourceTree = "<group>"; };
39022C201EDC2D0800100066 /* icudt60l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt60l.dat; path = ../generated/resources/icudt60l.dat; sourceTree = "<group>"; };
- 391FE7591FBC89BE00C592BA /* LibreOfficeKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibreOfficeKit.h; path = ../LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h; sourceTree = "<group>"; };
39284DB01FA5E150006F43E4 /* dummyLOkit.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dummyLOkit.c; sourceTree = "<group>"; };
39284DB21FA5F207006F43E4 /* DocumentActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentActions.swift; sourceTree = "<group>"; };
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; sourceTree = SOURCE_ROOT; };
@@ -51,7 +50,6 @@
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LibreOfficeLight.entitlements; sourceTree = "<group>"; };
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LibreOfficeKit.h; path = ../../include/LibreOfficeKit/LibreOfficeKit.h; sourceTree = "<group>"; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
- 397A4C3B1FC574A100566B54 /* loApp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loApp.xcconfig; path = ../../../../sim/workdir/ios/loApp.xcconfig; sourceTree = "<group>"; };
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = SOURCE_ROOT; };
397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -66,7 +64,7 @@
39B08B9B1E5F0BB600682A59 /* udkapi.rdb */ = {isa = PBXFileReference; lastKnownFileType = file; name = udkapi.rdb; path = ../generated/resources/udkapi.rdb; sourceTree = SOURCE_ROOT; };
39B08B9C1E5F0BB600682A59 /* unorc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = unorc; path = ../generated/resources/unorc; sourceTree = SOURCE_ROOT; };
39B092501E5F3DEA00682A59 /* LibreOfficeLight-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "LibreOfficeLight-Prefix.pch"; sourceTree = "<group>"; };
- 39E7CD5D1FB9C7F000FD9BE1 /* LibreOfficeKit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = LibreOfficeKit.c; path = ../LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c; sourceTree = "<group>"; };
+ 39E950521FC9842000D82C49 /* source */ = {isa = PBXFileReference; lastKnownFileType = folder; name = source; path = ../source; sourceTree = "<group>"; };
39EE81531FA644E800B73AB8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
39EF4E2E1FA500C9001914AC /* PropertiesController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PropertiesController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -88,7 +86,6 @@
3911D89F1E5993600050D6BC /* Support files */ = {
isa = PBXGroup;
children = (
- 397A4C3B1FC574A100566B54 /* loApp.xcconfig */,
39B092501E5F3DEA00682A59 /* LibreOfficeLight-Prefix.pch */,
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */,
397E09071E597BD8001374E0 /* Assets.xcassets */,
@@ -101,8 +98,7 @@
3956B72D1FAB3DBF00BF5DE4 /* extra */ = {
isa = PBXGroup;
children = (
- 391FE7591FBC89BE00C592BA /* LibreOfficeKit.h */,
- 39E7CD5D1FB9C7F000FD9BE1 /* LibreOfficeKit.c */,
+ 39E950521FC9842000D82C49 /* source */,
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */,
);
name = extra;
@@ -249,12 +245,12 @@
39B08BD71E5F0BB600682A59 /* rc in Resources */,
39B08B9E1E5F0BB600682A59 /* offapi.rdb in Resources */,
39022C211EDC2D0800100066 /* icudt60l.dat in Resources */,
+ 39E950531FC9842000D82C49 /* source in Resources */,
39022C1B1EDC2A0E00100066 /* program in Resources */,
39022C1D1EDC2A2C00100066 /* services in Resources */,
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */,
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */,
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in Resources */,
- 397A4C3C1FC574A100566B54 /* loApp.xcconfig in Resources */,
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */,
39B091CD1E5F0BB800682A59 /* udkapi.rdb in Resources */,
39B08BD91E5F0BB600682A59 /* services.rdb in Resources */,
@@ -306,7 +302,6 @@
/* Begin XCBuildConfiguration section */
397E09231E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 397A4C3B1FC574A100566B54 /* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
@@ -314,6 +309,7 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_OPTIMIZATION_PROFILE_FILE = "$(SRCROOT)/../generated/$(PROJECT_NAME).profdata";
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
@@ -352,37 +348,20 @@
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",
- );
+ HEADER_SEARCH_PATHS = "$(inherited)";
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+ LD_MAP_FILE_PATH = "";
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
+ OTHER_LDFLAGS = "../generated/LibreOfficeKit_ARM64.o\t\t";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OBJC_BRIDGING_HEADER = "lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
+ SYMROOT = ../generated/build;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
};
@@ -390,7 +369,6 @@
};
397E09241E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 397A4C3B1FC574A100566B54 /* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
@@ -398,6 +376,7 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_OPTIMIZATION_PROFILE_FILE = "$(SRCROOT)/../generated/$(PROJECT_NAME).profdata";
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
@@ -416,6 +395,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -430,36 +410,19 @@
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_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_SRCDIR)/ios/generated",
- );
- "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_SRCDIR)/ios/generated",
- );
+ HEADER_SEARCH_PATHS = "$(inherited)";
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+ LD_MAP_FILE_PATH = "";
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = NO;
- ONLY_ACTIVE_ARCH = NO;
- OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
+ ONLY_ACTIVE_ARCH = YES;
+ OTHER_LDFLAGS = ../generated/LibreOfficeKit_ARM64.o;
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
+ SYMROOT = ../generated/build;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "arm64 x86_64";
@@ -468,7 +431,6 @@
};
397E09261E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 397A4C3B1FC574A100566B54 /* loApp.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
@@ -480,16 +442,7 @@
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",
- );
+ HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -508,7 +461,6 @@
};
397E09271E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 397A4C3B1FC574A100566B54 /* loApp.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
@@ -538,7 +490,6 @@
};
39ACF41A1F8A358000DA7334 /* Simulator */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 397A4C3B1FC574A100566B54 /* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
@@ -546,6 +497,7 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_OPTIMIZATION_PROFILE_FILE = "$(SRCROOT)/../generated/$(PROJECT_NAME).profdata";
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
@@ -584,37 +536,20 @@
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",
- );
+ HEADER_SEARCH_PATHS = "$(inherited)";
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+ LD_MAP_FILE_PATH = "";
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
+ OTHER_LDFLAGS = ../generated/LibreOfficeKit_ARM64_debug.o;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OBJC_BRIDGING_HEADER = "lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
+ SYMROOT = ../generated/build;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
};
@@ -622,7 +557,6 @@
};
39ACF41B1F8A358000DA7334 /* Simulator */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 397A4C3B1FC574A100566B54 /* loApp.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
@@ -634,16 +568,7 @@
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",
- );
+ HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
index 5168dd42d668..a14a9aeb6164 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
+++ b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
@@ -363,7 +363,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.8.3</string>
+ <string>0.8.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
commit b289dd1bef969185b8219c6c520b194faa2c8b74
Author: jan Iversen <jani at libreoffice.org>
Date: Sat Nov 25 09:22:40 2017 +0100
iOS corrected object name
removed "lib" from object name
updated README
Change-Id: I37948aca4d3a1e226e55a84a13e41d0237cbc6fb
diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index 76ece5a5023b..2588e72110ca 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -10,9 +10,9 @@ IOSDEV = /Applications/Xcode.app/Contents/Developer/
IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
ifeq ($(ENABLE_DEBUG),TRUE)
-IOSKIT = $(SRCDIR)/ios/generated/libLibreOfficeKit_$(CPUNAME)_debug.o
+IOSKIT = $(SRCDIR)/ios/generated/LibreOfficeKit_$(CPUNAME)_debug.o
else
-IOSKIT = $(SRCDIR)/ios/generated/libLibreOfficeKit_$(CPUNAME).o
+IOSKIT = $(SRCDIR)/ios/generated/LibreOfficeKit_$(CPUNAME).o
endif
diff --git a/ios/README b/ios/README
index 0151d72fd34c..6ad40d2ef8a4 100644
--- a/ios/README
+++ b/ios/README
@@ -41,7 +41,6 @@ Due to the multiple workdirs a separate work directories are needed as follows:
--enable-debug
--enable-ios-simulator
#--host=arm64-apple-darwin
- ./ios-app - workdir for UI, NO autogen.input
-- Steps to generate
1) copy ./core/distro-configs/LibreOfficeiOS.conf to autogen.input in
@@ -49,14 +48,12 @@ Due to the multiple workdirs a separate work directories are needed as follows:
Correct as per above, add your local setup (e.g. location of tarballs)
2) run ../core/autogen.sh in ios-arm64, ios-arm64-debug and ios-simulator
3) run make in ios-arm64, ios-arm64-debug and ios-simulator
- this will generate ./*/ios/lo[Kit|App].xcconfig which prepares LO to be compiled
+ this will generate core/loApp.xcconfig which prepares LO to be compiled
and build LOkit is 3 configurations and store the LibreOfficeKit
- libraries in ./core/ios/generated as:
- LibreOfficeKit-arm64.a
- LibreOfficeKit-arm64-debug.a
- LibreOfficeKit-simulator.a
- *note* run "make build-nocheck" in ios-simulator for the time being
-4) run ../core/autogen.sh in ios-app
+ prelinked object in ./core/ios/generated as:
+ LibreOfficeKit-arm64.o
+ LibreOfficeKit-arm64-debug.o
+ LibreOfficeKit-simulator.o
5) open xcode with LibreOfficeLight add ./ios-app/ios/loApp.xconfig to the project.
6) enjoy
More information about the Libreoffice-commits
mailing list