[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS.mk ios/LibreOfficeKit

[jan Iversen]

 ios/CustomTarget_iOS.mk                                     |   10 ++++++++--
 ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj |   10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit c1520da5904b06d0c246362594c8b5d251f63f8a
Author: jan Iversen <jani at libreoffice.org>
Date:   Fri Sep 29 14:22:29 2017 +0200

    iOS, clean workspace and local build
    
    We need to check if it possible to move workspace to
    workdir (e.g. do a reverse ln)
    
    Change-Id: I98751c1731f75e3b4200520ffa741a7348fe70fb

diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index d6426ac72cba..092cd2058761 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -180,6 +180,12 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT)
 $(call gb_CustomTarget_get_clean_target,ios/ios):
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
 	rm -rf $(IOSGEN) $(IOSKITXC) $(IOSAPPXC)
+	rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.xcworkspace
+	rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/xcuserdata
+	rm -rf $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.xcworkspace
+	rm -rf $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcuserdata
+	rm -rf $(SRCDIR)/ios/LibreOfficeLight/build
+	rm -rf $(SRCDIR)/ios/LibreOfficeKit/build
 
 
 # vim: set noet sw=4 ts=4:
commit 7121b70286d786ccef90b1711d2d6344f0dd70a9
Author: jan Iversen <jani at libreoffice.org>
Date:   Fri Sep 29 14:08:40 2017 +0200

    iOS, first version of static lib ready.
    
    This works when working online in xcode, but not from make
    
    Change-Id: I5c871f05b3c986ead17ff926430e82da1808a52c

diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index e28642633223..d6426ac72cba 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -48,8 +48,8 @@ $(IOSKITXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
 
 	@echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKITXC)
 	@echo "OTHER_CPLUSPLUSFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKITXC)
-	@echo "LINK_LDFLAGS = -Wl,-lz,-liconv,-map,$(WORKDIR)/iosKit.map " \
-              "`$(SRCDIR)/bin/lo-all-static-libs`" >> $(IOSKITXC)
+	@echo PRELINK_LIBS = "`$(SRCDIR)/bin/lo-all-static-libs`" >> $(IOSKITXC)
+	@echo "LINK_LDFLAGS = -Wl,-lz,-liconv,-map,$(WORKDIR)/iosKit.map "
 	@echo "SYMROOT = $(WORKDIR)/ios/build\n" >> $(IOSKITXC)
 
 $(IOSAPPXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk 
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index 0c28349a87eb..fe610f22939b 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		394699991F7E1CCE0085AD3B /* native-code.mm in Sources */ = {isa = PBXBuildFile; fileRef = 394699981F7E1CCE0085AD3B /* native-code.mm */; };
 		39B5D21A1F78130F008FB162 /* LibreOfficeKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */; };
 		39B5D21B1F78130F008FB162 /* LibreOfficeKit.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */; };
 /* End PBXBuildFile section */
@@ -26,8 +25,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		394699981F7E1CCE0085AD3B /* native-code.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "native-code.mm"; path = "../../generated/native-code.mm"; sourceTree = "<group>"; };
-		39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loKit.xcconfig; path = ../../../../../../../Users/jani/lo_ios/ios/loKit.xcconfig; sourceTree = "<group>"; };
+		39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loKit.xcconfig; path = /Users/jani/lo_ios/ios/loKit.xcconfig; sourceTree = "<group>"; };
 		39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; };
 		39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LibreOfficeKit.mm; sourceTree = "<group>"; };
@@ -71,7 +69,6 @@
 		39B5D2171F78130F008FB162 /* LibreOfficeKit */ = {
 			isa = PBXGroup;
 			children = (
-				394699981F7E1CCE0085AD3B /* native-code.mm */,
 				39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */,
 				39B5D2181F78130F008FB162 /* LibreOfficeKit.h */,
 				39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */,
@@ -137,7 +134,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				39B5D21A1F78130F008FB162 /* LibreOfficeKit.mm in Sources */,
-				394699991F7E1CCE0085AD3B /* native-code.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -149,6 +145,7 @@
 			baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -187,6 +184,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_MASTER_OBJECT_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -214,6 +212,7 @@
 			baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -246,6 +245,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_MASTER_OBJECT_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,