iOS, configure XCODE_* => IOS_*

Exporting variables XCODE_* makes xcodebuild read them, independent of command line settings. Therefore renamed these variables to IOS_ (they are only used to build iOS). Change-Id: I2c44d2e8a1348270e2f2a6768e0552c39e7f7d72

iOS, configure XCODE_* => IOS_*
Exporting variables XCODE_* makes xcodebuild read them, independent of command line settings. Therefore renamed these variables to IOS_ (they are only used to build iOS). Change-Id: I2c44d2e8a1348270e2f2a6768e0552c39e7f7d72
4627857e · jan Iversen · 0d43f517 · 4627857e · 4627857e · 4627857e
Kaydet (Commit) 4627857e authored Eyl 30, 2017 tarafından jan Iversen
Hide whitespace changes
Inline Side-by-side

Showing with 31 additions and 31 deletions

config_host.mk.in config_host.mk.in +4 -4

configure.ac configure.ac +13 -13

CustomTarget_iOS.mk ios/CustomTarget_iOS.mk +14 -14

No files found.
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -618,10 +618,10 @@ export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@
 export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
 export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
 export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
-export XCODE_DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
-export XCODE_CLANG_CXX_LIBRARY=@XCODE_CLANG_CXX_LIBRARY@
-export XCODE_ARCHS=@XCODE_ARCHS@
-export XCODEBUILD_SDK=@XCODEBUILD_SDK@
+export IOS_DEBUG_INFORMATION_FORMAT=@IOS_DEBUG_INFORMATION_FORMAT@
+export IOS_CLANG_CXX_LIBRARY=@IOS_CLANG_CXX_LIBRARY@
+export IOS_ARCHS=@IOS_ARCHS@
+export IOS_SDK=@IOS_SDK@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
 export XMLSEC_CFLAGS=$(gb_SPACE)@XMLSEC_CFLAGS@

--- a/configure.ac
+++ b/configure.ac
@@ -2872,12 +2872,12 @@ if test $_os = iOS; then
    if test "$enable_ios_simulator" = "yes"; then
        platform=iPhoneSimulator
        versionmin=-mios-simulator-version-min=9.3
-        XCODE_ARCHS=x86_64
+        IOS_ARCHS=x86_64
        BITNESS=-fembed-bitcode
    else
        platform=iPhoneOS
        versionmin=-miphoneos-version-min=9.3
-        XCODE_ARCHS=arm64
+        IOS_ARCHS=arm64
        BITNESS=-fembed-bitcode
    fi
    xcode_developer=`xcode-select -print-path`
@@ -2898,7 +2898,7 @@ if test $_os = iOS; then

    AC_MSG_RESULT($sysroot)

-    XCODEBUILD_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
+    IOS_SDK=`echo $platform | tr A-Z a-z`$ios_sdk

    # LTO is not really recommended for iOS builds,
    # the link time will be astronomical
@@ -2909,11 +2909,11 @@ if test $_os = iOS; then
    # get compiled with it, to avoid ld warnings when linking all that together into one
    # executable.

-    XCODE_CLANG_CXX_LIBRARY=libc++
-    stdlib="-stdlib=$XCODE_CLANG_CXX_LIBRARY"
+    IOS_CLANG_CXX_LIBRARY=libc++
+    stdlib="-stdlib=$IOS_CLANG_CXX_LIBRARY"

-    CC="`xcrun -find clang` -arch $XCODE_ARCHS -fvisibility=hidden $BITNESS -isysroot $sysroot $lto $versionmin"
-    CXX="`xcrun -find clang++` -arch $XCODE_ARCHS -fvisibility=hidden $stdlib $BITNESS -isysroot $sysroot $lto $versionmin"
+    CC="`xcrun -find clang` -arch $IOS_ARCHS -fvisibility=hidden $BITNESS -isysroot $sysroot $lto $versionmin"
+    CXX="`xcrun -find clang++` -arch $IOS_ARCHS -fvisibility=hidden $stdlib $BITNESS -isysroot $sysroot $lto $versionmin"

    INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
    AR=`xcrun -find ar`
@@ -2923,9 +2923,9 @@ if test $_os = iOS; then
    RANLIB=`xcrun -find ranlib`
 fi

-AC_SUBST(XCODE_CLANG_CXX_LIBRARY)
-AC_SUBST(XCODE_ARCHS)
-AC_SUBST(XCODEBUILD_SDK)
+AC_SUBST(IOS_CLANG_CXX_LIBRARY)
+AC_SUBST(IOS_ARCHS)
+AC_SUBST(IOS_SDK)

 AC_MSG_CHECKING([whether to treat the installation as read-only])

@@ -3871,11 +3871,11 @@ fi
 # Debug information format for iOS. Running dsymutil takes a long time... you really need a separate
 # .dSYM only if running Instruments, I think. (Not for normal debugging in Xcode.) To enable a
 # separate .dSYM, either use --enable-release-build or change manually to "DWARF with DSYM" in Xcode.
-XCODE_DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
+IOS_DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
 if test "$enable_release_build" != yes -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \); then
-    XCODE_DEBUG_INFORMATION_FORMAT=dwarf
+    IOS_DEBUG_INFORMATION_FORMAT=dwarf
 fi
-AC_SUBST(XCODE_DEBUG_INFORMATION_FORMAT)
+AC_SUBST(IOS_DEBUG_INFORMATION_FORMAT)

 AC_MSG_CHECKING([whether to compile with optimization flags])
 if test -z "$enable_optimized"; then

--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -38,12 +38,12 @@ $(IOSKITXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
 	@echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSKITXC)
 	@echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSKITXC)
 	@echo "\n// These are actual Xcode-known settings. The corresponding autoconf" >> $(IOSKITXC)
-	@echo "// variables are prefixed with XCODE_ to make it clear in configure.ac" >> $(IOSKITXC)
+	@echo "// variables are prefixed with IOS_ to make it clear in configure.ac" >> $(IOSKITXC)
 	@echo "// what they will be used for." >> $(IOSKITXC)
-	@echo "ARCHS = $(XCODE_ARCHS)" >> $(IOSKITXC)
-	@echo "VALID_ARCHS = $(XCODE_ARCHS)" >> $(IOSKITXC)
-	@echo "CLANG_CXX_LIBRARY = $(XCODE_CLANG_CXX_LIBRARY)" >> $(IOSKITXC)
-	@echo "DEBUG_INFORMATION_FORMAT=$(XCODE_DEBUG_INFORMATION_FORMAT)" >> $(IOSKITXC)
+	@echo "ARCHS = $(IOS_ARCHS)" >> $(IOSKITXC)
+	@echo "VALID_ARCHS = $(IOS_ARCHS)" >> $(IOSKITXC)
+	@echo "CLANG_CXX_LIBRARY = $(IOS_CLANG_CXX_LIBRARY)" >> $(IOSKITXC)
+	@echo "DEBUG_INFORMATION_FORMAT=$(IOS_DEBUG_INFORMATION_FORMAT)" >> $(IOSKITXC)
 	@echo "\n// These settings are edited in CustomTarget_Lo_Xcconfig.mk." >> $(IOSKITXC)

 	@echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKITXC)
@@ -64,12 +64,12 @@ $(IOSAPPXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
 	@echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSAPPXC)
 	@echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSAPPXC)
 	@echo "\n// These are actual Xcode-known settings. The corresponding autoconf" >> $(IOSAPPXC)
-	@echo "// variables are prefixed with XCODE_ to make it clear in configure.ac" >> $(IOSAPPXC)
+	@echo "// variables are prefixed with IOS_ to make it clear in configure.ac" >> $(IOSAPPXC)
 	@echo "// what they will be used for." >> $(IOSAPPXC)
-	@echo "ARCHS = $(XCODE_ARCHS)" >> $(IOSAPPXC)
-	@echo "VALID_ARCHS = $(XCODE_ARCHS)" >> $(IOSAPPXC)
-	@echo "CLANG_CXX_LIBRARY = $(XCODE_CLANG_CXX_LIBRARY)" >> $(IOSAPPXC)
-	@echo "DEBUG_INFORMATION_FORMAT=$(XCODE_DEBUG_INFORMATION_FORMAT)" >> $(IOSAPPXC)
+	@echo "ARCHS = $(IOS_ARCHS)" >> $(IOSAPPXC)
+	@echo "VALID_ARCHS = $(IOS_ARCHS)" >> $(IOSAPPXC)
+	@echo "CLANG_CXX_LIBRARY = $(IOS_CLANG_CXX_LIBRARY)" >> $(IOSAPPXC)
+	@echo "DEBUG_INFORMATION_FORMAT=$(IOS_DEBUG_INFORMATION_FORMAT)" >> $(IOSAPPXC)
 	@echo "\n// These settings are edited in CustomTarget_Lo_Xcconfig.mk." >> $(IOSAPPXC)

 	@echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSAPPXC)
@@ -149,8 +149,8 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj iosCopySetup
 	        -xcconfig $(IOSKITXC) \
 	        -project $(IOSKITPRJ) \
 	        -target LibreOfficeKit \
-	        -sdk $(XCODEBUILD_SDK) \
-	        -arch $(XCODE_ARCHS) \
+	        -sdk $(IOS_SDK) \
+	        -arch $(IOS_ARCHS) \
 	        -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
 	        build \
 	        , $(WORKDIR)/ios/build.log \
@@ -168,8 +168,8 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT)
 	        -xcconfig $(IOSAPPXC) \
 	        -project $(IOSAPPPRJ) \
 	        -target LibreOfficeLight \
-	        -sdk $(XCODEBUILD_SDK) \
-	        -arch $(XCODE_ARCHS) \
+	        -sdk $(IOS_SDK) \
+	        -arch $(IOS_ARCHS) \
 	        -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
 	        build \
 	        , $(WORKDIR)/ios/build.log \