ios/CustomTarget_iOS.mk | 5 +
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 15 +++--
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 26
+++++-----
3 files changed, 24 insertions(+), 22 deletions(-)
New commits:
commit dea1b649765262b2e8beac88b0977d5dead98953
Author: jan Iversen <j...@libreoffice.org>
Date: Thu Sep 28 14:12:22 2017 +0200
iOS, WIP build static library loKit
WIP on the road to prelink all LO libraries into a single
static library for each arm64, arm64-debug, simulator
Change-Id: I5e7aaefa46c9d234252ba3b6848f173647215795
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index bae73aae9df7..6d817c1d5e1f 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -93,6 +93,7 @@ ifeq ("$(wildcard $(IOSRES))","")
> $(IOSGEN)/native-code.mm
# generate resource files used to start/run LibreOffice
+ cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt59l.dat
$(IOSRES)/icudt59l.dat
cp $(INSTDIR)/program/types.rdb $(IOSRES)/udkapi.rdb
cp $(INSTDIR)/program/types/offapi.rdb $(IOSRES)
cp $(INSTDIR)/program/types/oovbaapi.rdb $(IOSRES)
@@ -147,7 +148,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj
iosCopySetup
xcodebuild \
-xcconfig $(IOSKITXC) \
-project $(IOSKITPRJ) \
- -target iOS_LO_Kit.a \
+ -target LibreOfficeKit \
-sdk $(XCODEBUILD_SDK) \
-arch $(XCODE_ARCHS) \
-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
@@ -166,7 +167,7 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj
$(IOSGEN)/$(IOSKIT)
xcodebuild \
-xcconfig $(IOSAPPXC) \
-project $(IOSAPPPRJ) \
- -target $(IOSAPP) \
+ -target LibreOfficeLight \
-sdk $(XCODEBUILD_SDK) \
-arch $(XCODE_ARCHS) \
-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index 0bb2386137bd..ee698445bd97 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -160,7 +160,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Developer";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -187,7 +187,7 @@
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_WORKDIR)/ios/generated",
+ "$(LO_SRCDIR)/ios/generated",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = YES;
@@ -197,7 +197,7 @@
"-lstdc++",
);
SDKROOT = iphoneos;
- VALID_ARCHS = arm64;
+ VALID_ARCHS = "x86_64 arm64";
};
name = Debug;
};
@@ -223,7 +223,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Developer";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_NS_ASSERTIONS = NO;
@@ -244,18 +244,19 @@
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_WORKDIR)/ios/generated",
+ "$(LO_SRCDIR)/ios/generated",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = NO;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(LINK_LDFLAGS)",
"-lstdc++",
);
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
- VALID_ARCHS = arm64;
- "VALID_ARCHS[sdk=*]" = arm64;
+ VALID_ARCHS = "x86_64 arm64";
+ "VALID_ARCHS[sdk=*]" = "";
};
name = Release;
};
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 36856498d786..70173f60587c 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -34,10 +34,10 @@
/* Begin PBXFileReference section */
39022C171EDC142F00100066 /* lokit.mm */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp;
path = lokit.mm; sourceTree = "<group>"; };
39022C191EDC14D300100066 /* lokit-Bridging-Header.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"lokit-Bridging-Header.h"; sourceTree = "<group>"; };
- 39022C1A1EDC2A0E00100066 /* program */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = program; path =
../../ioswork/ios/resources/program; sourceTree = "<group>"; };
- 39022C1C1EDC2A2C00100066 /* services */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = services; path =
../../ioswork/ios/resources/services; sourceTree = "<group>"; };
- 39022C1E1EDC2AB000100066 /* share */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = share; path =
../../ioswork/ios/resources/share; sourceTree = "<group>"; };
- 39022C201EDC2D0800100066 /* icudt59l.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = icudt59l.dat; path =
../../ioswork/UnpackedTarball/icu/source/data/in/icudt59l.dat; sourceTree =
"<group>"; };
+ 39022C1A1EDC2A0E00100066 /* program */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = program; path =
../generated/resources/program; sourceTree = "<group>"; };
+ 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 /* icudt59l.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = icudt59l.dat; path =
../generated/resources/icudt59l.dat; sourceTree = "<group>"; };
39022C231EDC303200100066 /* en */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = en; path =
en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift;
sourceTree = SOURCE_ROOT; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa =
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path =
Settings.bundle; sourceTree = "<group>"; };
@@ -50,13 +50,13 @@
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; };
- 39B084E51E5F0BB400682A59 /* fundamentalrc */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name =
fundamentalrc; path = ../../ioswork/ios/resources/fundamentalrc; sourceTree =
SOURCE_ROOT; };
- 39B084E61E5F0BB400682A59 /* offapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = offapi.rdb; path =
../../ioswork/ios/resources/offapi.rdb; sourceTree = SOURCE_ROOT; };
- 39B084E71E5F0BB400682A59 /* oovbaapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = oovbaapi.rdb; path =
../../ioswork/ios/resources/oovbaapi.rdb; sourceTree = SOURCE_ROOT; };
- 39B085211E5F0BB400682A59 /* rc */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = rc; path =
../../ioswork/ios/resources/rc; sourceTree = SOURCE_ROOT; };
- 39B085241E5F0BB400682A59 /* services.rdb */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name =
services.rdb; path = ../../ioswork/ios/resources/services.rdb; sourceTree =
SOURCE_ROOT; };
- 39B08B9B1E5F0BB600682A59 /* udkapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = udkapi.rdb; path =
../../ioswork/ios/resources/udkapi.rdb; sourceTree = SOURCE_ROOT; };
- 39B08B9C1E5F0BB600682A59 /* unorc */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = unorc; path =
../../ioswork/ios/resources/unorc; sourceTree = SOURCE_ROOT; };
+ 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; };
+ 39B085211E5F0BB400682A59 /* rc */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = rc; path =
../generated/resources/rc; sourceTree = SOURCE_ROOT; };
+ 39B085241E5F0BB400682A59 /* services.rdb */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name =
services.rdb; path = ../generated/resources/services.rdb; sourceTree =
SOURCE_ROOT; };
+ 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>"; };
/* End PBXFileReference section */
@@ -354,7 +354,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
- VALID_ARCHS = arm64;
+ VALID_ARCHS = "arm64 x86_64";
"VALID_ARCHS[sdk=*]" = arm64;
};
name = Debug;
@@ -425,7 +425,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
- VALID_ARCHS = arm64;
+ VALID_ARCHS = "arm64 x86_64";
"VALID_ARCHS[sdk=*]" = arm64;
};
name = Release;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
