[Libreoffice-commits] core.git: ios/CustomTarget_iOS.mk ios/.gitignore ios/LibreOfficeLight ios/loKit.xcconfig.in

[jan Iversen]

 ios/.gitignore                                                  |    1 -
 ios/CustomTarget_iOS.mk                                         |    8 ++++++++
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |    3 +++
 ios/loKit.xcconfig.in                                           |    2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit bf8193cb4f36a0593b763a13970f6d42a7eef26f
Author: jan Iversen <jani at libreoffice.org>
Date:   Sun Oct 22 11:23:49 2017 +0200

    iOS, linking adjustments
    
    Small adjustments to clean up the process
    
    Change-Id: Ibbe50bb2aa553e253e22ec107c27a075b588a6cd

diff --git a/ios/.gitignore b/ios/.gitignore
index 04927dd74172..8bd528904f33 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -6,5 +6,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-lo*.xcconfig
 generated
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index 737a19404bc5..452b5d7dde9b 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -153,6 +153,14 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT)
 #- clean ios  -----------------------------------------------------------------
 $(call gb_CustomTarget_get_clean_target,ios/ios):
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
+	$(call gb_Helper_print_on_error, \
+	    xcodebuild -xcconfig $(IOSAPPXC) -project $(IOSAPPPRJ) clean \
+	        , $(WORKDIR)/ios/build.log \
+	)
+	$(call gb_Helper_print_on_error, \
+	    xcodebuild -xcconfig $(IOSKITXC) -project $(IOSKITPRJ) clean \
+	        , $(WORKDIR)/ios/build.log \
+	)
 	rm -f $(IOSGEN)/$(IOSKIT)
 	rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.xcworkspace
 	rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/xcuserdata
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 168bf689fac9..0eb69658bf5a 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -323,6 +323,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -406,6 +407,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -550,6 +552,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
diff --git a/ios/loKit.xcconfig.in b/ios/loKit.xcconfig.in
index 1a00e5747257..a206fe12015d 100644
--- a/ios/loKit.xcconfig.in
+++ b/ios/loKit.xcconfig.in
@@ -15,3 +15,5 @@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
 SYMROOT = @SYMROOT@
 
 PRELINK_LIBS = @PRELINK@
+
+