[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac ios/CustomTarget_iOS_setup.mk ios/StaticLibrary_iOSkit.mk

[jan Iversen]

 config_host.mk.in             |    1 +
 configure.ac                  |   10 ++++++----
 ios/CustomTarget_iOS_setup.mk |    8 ++++----
 ios/StaticLibrary_iOSkit.mk   |    6 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 99534540df148513fc0bb9622b7285e10b285ccb
Author: jan Iversen <jani at libreoffice.org>
Date:   Fri Nov 24 08:24:12 2017 +0100

    iOS, added IOS_DEPLOYMENT_VERSION
    
    Change-Id: Ie72c8303011df8a4e0e489ab505e619bd7a40e12

diff --git a/config_host.mk.in b/config_host.mk.in
index 4ea5595baaaf..0b9528fa6569 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -622,6 +622,7 @@ export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
 export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
 export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
 export IOS_SDK=@IOS_SDK@
+export IOS_DEPLOYMENT_VERSION=@IOS_DEPLOYMENT_VERSION@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
 export XMLSEC_CFLAGS=$(gb_SPACE)@XMLSEC_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 8e0822caac64..5e50660f7aea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2845,17 +2845,17 @@ dnl ===================================================================
 
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
+    current_sdk_ver=11.1
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
-        versionmin=-mios-simulator-version-min=11.1
+        versionmin=-mios-simulator-version-min=$current_sdk_ver
     else
         platform=iPhoneOS
-        versionmin=-miphoneos-version-min=11.1
+        versionmin=-miphoneos-version-min=$current_sdk_ver
     fi
     xcode_developer=`xcode-select -print-path`
 
-    current_sdk_ver=11.1
-    for sdkver in 11.1; do
+    for sdkver in $current_sdk_ver; do
         t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
         if test -d $t; then
             ios_sdk=$sdkver
@@ -2871,6 +2871,7 @@ if test $_os = iOS; then
     AC_MSG_RESULT($sysroot)
 
     IOS_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
+    IOS_DEPLOYMENT_VERSION=$current_sdk_ver
 
     # LTO is not really recommended for iOS builds,
     # the link time will be astronomical
@@ -2892,6 +2893,7 @@ if test $_os = iOS; then
 fi
 
 AC_SUBST(IOS_SDK)
+AC_SUBST(IOS_DEPLOYMENT_VERSION)
 
 AC_MSG_CHECKING([whether to treat the installation as read-only])
 
commit 944da4b735d7c88fa7b7c200ea4c75dd1a6aa00e
Author: jan Iversen <jani at libreoffice.org>
Date:   Thu Nov 23 16:15:10 2017 +0100

    iOS .mk naming conventions.
    
    Updated target names, to allow cross references.
    
    Change-Id: Ie0959876df58657a2303ca2b0865e91a7f5a0eea

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index a1ae23e0fa3e..f32e85be3b9f 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -12,11 +12,11 @@ IOSAPPXC := $(WORKDIR)/ios/loApp.xcconfig
 
 
 #- Top level  -----------------------------------------------------------------
-$(eval $(call gb_CustomTarget_CustomTarget,ios/ios_setup))
+$(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_setup))
 
 
 
-$(call gb_CustomTarget_get_target,ios/ios_setup): $(IOSAPPXC) $(IOSGEN)/native-code.h
+$(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSAPPXC) $(IOSGEN)/native-code.h
 
 
 
@@ -93,12 +93,12 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 
 
 
-
 #- clean ios  -----------------------------------------------------------------
-$(call gb_CustomTarget_get_clean_target,ios/ios_setup):
+$(call gb_CustomTarget_get_clean_target,ios/iOS_setup):
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
 	rm -rf $(IOSRES) $(IOSGEN)/native-code.h $(IOSAPPXC)
 	rm -rf $(WORKDIR)/ios
 
 
+
 # vim: set noet sw=4 ts=4:
diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk
index 3653e17d9a72..67f8b086cfcf 100644
--- a/ios/StaticLibrary_iOSkit.mk
+++ b/ios/StaticLibrary_iOSkit.mk
@@ -17,14 +17,14 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,iOSkit))
+$(eval $(call gb_StaticLibrary_StaticLibrary,iOS_kitBridge))
 
-$(eval $(call gb_StaticLibrary_set_include,iOSkit,\
+$(eval $(call gb_StaticLibrary_set_include,iOS_kitBridge,\
     $$(INCLUDE) \
     -I$(SRCDIR)/ios/generated \
 ))
 
-$(eval $(call gb_StaticLibrary_add_cobjects,iOSkit,\
+$(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\
     ios/source/LibreOfficeKit \
 ))