[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_prelink.mk ios/LibreOfficeLight

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk                                 |    7 +++++
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   14 ++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit cdfd99e27d4c72b43b8f36a6c62c86c68b463199
Author: jan Iversen <jani at libreoffice.org>
Date:   Mon Jan 8 15:36:51 2018 +0100

    iOS, codesigning .dylib
    
    .dylib can only be loaded if signed, so added
    codesign to make
    
    In order not to expose the code identity, this is added through
    use of an environment variable IOS_CODESIGN
    
    Change-Id: I03ee7a6f2bfa8493a08b3e90163ab6c68d3c94a9

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index affd32e5bf59..fec4fd271511 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -64,6 +64,13 @@ $(IOSKIT): $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o
 	    $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
 	    `$(SRCDIR)/bin/lo-all-static-libs` \
 	    -o $(IOSKIT)
+ifeq ($(origin IOS_CODEID),undefined)
+	@echo "please define environment variable IOS_CODEID as\n" \
+	      "export IOS_CODEID=<your apple code identifier>"
+	@exit -1
+else
+	codesign -s "$(IOS_CODEID)" $(IOSKIT) 
+endif
 
 
 
commit ee3edd994597e751baa279b9cafc14c3db6e39f1
Author: jan Iversen <jani at libreoffice.org>
Date:   Mon Jan 8 13:41:29 2018 +0100

    iOS, switched simulator to use .dylib
    
    changed static lib to .dylib causing link times to be 1-2 seconds.
    
    However .dylib have a "missing code signature".
    
    Change-Id: I59e95444a0db5406075bc15360f0acb6ab08b65b

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 08e146c58d8c..5134985d5b18 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -16,7 +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 */; };
-		396C833F1FC9D89E008E662A /* libKit_X86_64_debug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* libKit_X86_64_debug.a */; };
+		396C833F1FC9D89E008E662A /* libKit_X86_64_debug.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* libKit_X86_64_debug.dylib */; };
 		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 */; };
@@ -47,8 +47,7 @@
 		393975791F8BECC1002DC80B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "lokit-Bridging-Header.h"; sourceTree = "<group>"; };
 		39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-		396C833C1FC9D62B008E662A /* libtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtest.a; path = ../generated/libtest.a; sourceTree = "<group>"; };
-		396C833E1FC9D89D008E662A /* libKit_X86_64_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libKit_X86_64_debug.a; path = ../generated/libKit_X86_64_debug.a; sourceTree = "<group>"; };
+		396C833E1FC9D89D008E662A /* libKit_X86_64_debug.dylib */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libKit_X86_64_debug.dylib; path = ../generated/libKit_X86_64_debug.dylib; sourceTree = "<group>"; };
 		396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		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>"; };
@@ -77,7 +76,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				396C833F1FC9D89E008E662A /* libKit_X86_64_debug.a in Frameworks */,
+				396C833F1FC9D89E008E662A /* libKit_X86_64_debug.dylib in Frameworks */,
 				39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */,
 				3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */,
 				393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */,
@@ -111,8 +110,7 @@
 		3972753A1E77D9F7006ACDCC /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				396C833E1FC9D89D008E662A /* libKit_X86_64_debug.a */,
-				396C833C1FC9D62B008E662A /* libtest.a */,
+				396C833E1FC9D89D008E662A /* libKit_X86_64_debug.dylib */,
 				39503A741F94D44900F19C78 /* libc++.tbd */,
 				393975791F8BECC1002DC80B /* libz.tbd */,
 				393975771F8BECB0002DC80B /* libiconv.tbd */,
@@ -361,7 +359,7 @@
 				MACH_O_TYPE = mh_execute;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = libKit_ARM64_debug.a;
+				OTHER_LDFLAGS = libKit_ARM64_debug.dylib;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "lokit-Bridging-Header.h";
@@ -551,7 +549,7 @@
 				MACH_O_TYPE = mh_execute;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = libKit_X86_64_debug.a;
+				OTHER_LDFLAGS = libKit_X86_64_debug.dylib;
 				OTHER_LIBTOOLFLAGS = "";
 				"OTHER_LIBTOOLFLAGS[arch=*]" = "";
 				SDKROOT = iphoneos;