iOS, linking adjustments

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

iOS, linking adjustments
Small adjustments to clean up the process Change-Id: Ibbe50bb2aa553e253e22ec107c27a075b588a6cd
bf8193cb · jan Iversen · f3476b7b · bf8193cb · bf8193cb · bf8193cb
Kaydet (Commit) bf8193cb authored Eki 22, 2017 tarafından jan Iversen
Showing with 13 additions and 1 deletion

.gitignore ios/.gitignore +0 -1

CustomTarget_iOS.mk ios/CustomTarget_iOS.mk +8 -0

project.pbxproj ...breOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +3 -0

loKit.xcconfig.in ios/loKit.xcconfig.in +2 -0

No files found.
--- 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
--- 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

--- 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;

--- a/ios/loKit.xcconfig.in
+++ b/ios/loKit.xcconfig.in
@@ -15,3 +15,5 @@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
 SYMROOT = @SYMROOT@

 PRELINK_LIBS = @PRELINK@
+
+