[Libreoffice-commits] core.git: config_host.mk.in configure.ac ios/CustomTarget_setup.mk ios/LibreOfficeKit ios/LibreOfficeLight ios/Module_ios.mk
jan Iversen
jani at libreoffice.org
Wed Sep 27 11:56:12 UTC 2017
config_host.mk.in | 2
configure.ac | 24 ++-------
ios/CustomTarget_setup.mk | 79 ++++++++++++++++++++++++++++++++
ios/LibreOfficeKit/lo_kit.xcconfig.in | 32 ------------
ios/LibreOfficeLight/lo_app.xcconfig.in | 32 ------------
ios/Module_ios.mk | 3 -
6 files changed, 88 insertions(+), 84 deletions(-)
New commits:
commit 9313fb9b5b872d7c888993ac186effcdcf9f8f57
Author: jan Iversen <jani at libreoffice.org>
Date: Wed Sep 27 13:51:39 2017 +0200
iOS, remove xcconfig generation from configure.ac
Moved generation of the xcconfig files out of configure.ac
and into the regular ios make.
Change-Id: If675eac9e86c4c4a0ff98f84815b0a83555d90a8
diff --git a/config_host.mk.in b/config_host.mk.in
index d8a7b9c14083..874d68d46431 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -618,6 +618,8 @@ 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 XINERAMA_LINK=@XINERAMA_LINK@
diff --git a/configure.ac b/configure.ac
index 4ecca6e36641..08f6863ae5ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2872,21 +2872,13 @@ if test $_os = iOS; then
if test "$enable_ios_simulator" = "yes"; then
platform=iPhoneSimulator
versionmin=-mios-simulator-version-min=9.3
- if test "$host_cpu" = "arm64"; then
- XCODE_ARCHS=x86_64
- BITNESS=-fembed-bitcode
- else
- XCODE_ARCHS=i386
- fi
+ XCODE_ARCHS=x86_64
+ BITNESS=-fembed-bitcode
else
platform=iPhoneOS
versionmin=-miphoneos-version-min=9.3
- if test "$host_cpu" = "arm64"; then
- XCODE_ARCHS=arm64
- BITNESS=-fembed-bitcode
- else
- XCODE_ARCHS=arm
- fi
+ XCODE_ARCHS=arm64
+ BITNESS=-fembed-bitcode
fi
xcode_developer=`xcode-select -print-path`
@@ -4412,9 +4404,7 @@ if test "$cross_compiling" = "yes"; then
bin/officeotron.sh.in \
instsetoo_native/util/openoffice.lst.in \
config_host/*.in \
- sysui/desktop/macosx/Info.plist.in \
- ios/LibreOfficeKit/lo_kit.xcconfig.in \
- ios/LibreOfficeLight/lo_app.xcconfig.in) \
+ sysui/desktop/macosx/Info.plist.in) \
| (cd CONF-FOR-BUILD && tar xf -)
cp configure CONF-FOR-BUILD
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
@@ -12377,9 +12367,7 @@ AC_CONFIG_FILES([config_host.mk
bin/odfvalidator.sh
bin/officeotron.sh
instsetoo_native/util/openoffice.lst
- sysui/desktop/macosx/Info.plist
- ios/LibreOfficeKit/lo_kit.xcconfig
- ios/LibreOfficeLight/lo_app.xcconfig])
+ sysui/desktop/macosx/Info.plist])
AC_CONFIG_HEADERS([config_host/config_buildid.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_dconf.h])
diff --git a/ios/CustomTarget_setup.mk b/ios/CustomTarget_setup.mk
new file mode 100644
index 000000000000..d0c64d799d32
--- /dev/null
+++ b/ios/CustomTarget_setup.mk
@@ -0,0 +1,79 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#- Env ------------------------------------------------------------------------
+IOSGEN := $(SRCDIR)/ios/generated
+IOSKIT := $(IOSGEN)/loKit.xcconfig
+IOSAPP := $(IOSGEN)/loApp.xcconfig
+
+
+#- Top level -----------------------------------------------------------------
+$(eval $(call gb_CustomTarget_CustomTarget,ios/setup))
+
+$(call gb_CustomTarget_get_target,ios/setup): $(IOSKIT) $(IOSAPP)
+
+
+#- Generate xcconfig files ---------------------------------------------------
+$(IOSKIT) : $(BUILDDIR)/config_host.mk
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+ @mkdir -p $(IOSGEN);
+ @echo "// Xcode configuration properties" > $(IOSKIT)
+ @echo "// To avoid confusion, the LO-specific ones that aren't as such used" >> $(IOSKIT)
+ @echo "// Xcode (but only expanded in option values) are prefixed with" >> $(IOSKIT)
+ @echo "// LO_.\n" >> $(IOSKIT)
+ @echo "LO_BUILDDIR = $(BUILDDIR)" >> $(IOSKIT)
+ @echo "LO_INSTDIR = $(INSTDIR)" >> $(IOSKIT)
+ @echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSKIT)
+ @echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSKIT)
+ @echo "\n// These are actual Xcode-known settings. The corresponding autoconf" >> $(IOSKIT)
+ @echo "// variables are prefixed with XCODE_ to make it clear in configure.ac" >> $(IOSKIT)
+ @echo "// what they will be used for." >> $(IOSKIT)
+ @echo "ARCHS = $(XCODE_ARCHS)" >> $(IOSKIT)
+ @echo "VALID_ARCHS = $(XCODE_ARCHS)" >> $(IOSKIT)
+ @echo "CLANG_CXX_LIBRARY = $(XCODE_CLANG_CXX_LIBRARY)" >> $(IOSKIT)
+ @echo "DEBUG_INFORMATION_FORMAT=$(XCODE_DEBUG_INFORMATION_FORMAT)" >> $(IOSKIT)
+ @echo "\n// These settings are edited in CustomTarget_Lo_Xcconfig.mk." >> $(IOSKIT)
+
+ @echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKIT)
+ @echo "OTHER_CPLUSPLUSFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKIT)
+ @echo "LINK_LDFLAGS = -Wl,-lz,-liconv,-map,$(WORKDIR)/iosKit.map " \
+ "`$(SRCDIR)/bin/lo-all-static-libs`" >> $(IOSKIT)
+ @echo "SYMROOT = $(WORKDIR)/ios/build\n" >> $(IOSKIT)
+
+$(IOSAPP) : $(BUILDDIR)/config_host.mk
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+ @mkdir -p $(IOSGEN);
+ @echo "// Xcode configuration properties" > $(IOSAPP)
+ @echo "// To avoid confusion, the LO-specific ones that aren't as such used" >> $(IOSAPP)
+ @echo "// Xcode (but only expanded in option values) are prefixed with" >> $(IOSAPP)
+ @echo "// LO_.\n" >> $(IOSAPP)
+ @echo "LO_BUILDDIR = $(BUILDDIR)" >> $(IOSAPP)
+ @echo "LO_INSTDIR = $(INSTDIR)" >> $(IOSAPP)
+ @echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSAPP)
+ @echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSAPP)
+ @echo "\n// These are actual Xcode-known settings. The corresponding autoconf" >> $(IOSAPP)
+ @echo "// variables are prefixed with XCODE_ to make it clear in configure.ac" >> $(IOSAPP)
+ @echo "// what they will be used for." >> $(IOSAPP)
+ @echo "ARCHS = $(XCODE_ARCHS)" >> $(IOSAPP)
+ @echo "VALID_ARCHS = $(XCODE_ARCHS)" >> $(IOSAPP)
+ @echo "CLANG_CXX_LIBRARY = $(XCODE_CLANG_CXX_LIBRARY)" >> $(IOSAPP)
+ @echo "DEBUG_INFORMATION_FORMAT=$(XCODE_DEBUG_INFORMATION_FORMAT)" >> $(IOSAPP)
+ @echo "\n// These settings are edited in CustomTarget_Lo_Xcconfig.mk." >> $(IOSAPP)
+
+ @echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSAPP)
+ @echo "OTHER_CPLUSPLUSFLAGS = $(gb_GLOBALDEFS)" >> $(IOSAPP)
+ @echo "LINK_LDFLAGS = -Wl,-lz,-liconv,-map,$(WORKDIR)/iosApp.map " >> $(IOSAPP)
+ @echo "SYMROOT = $(WORKDIR)/ios/build\n" >> $(IOSAPP)
+
+
+
+$(call gb_CustomTarget_get_clean_target,ios/setup):
+ $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
+ rm -rf $(IOSGEN)
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/ios/LibreOfficeKit/lo_kit.xcconfig.in b/ios/LibreOfficeKit/lo_kit.xcconfig.in
deleted file mode 100644
index 08623d8a9067..000000000000
--- a/ios/LibreOfficeKit/lo_kit.xcconfig.in
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- Mode: text; tab-width: 4; indent-tabs-mode: nil; word-wrap: nil -*-
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// Xcode configuration properties
-
-// To avoid confusion, the LO-specific ones that aren't as such used
-// by Xcode (but only expanded in option values) are prefixed with
-// LO_.
-
-LO_BUILDDIR = @BUILDDIR@
-LO_INSTDIR = @INSTDIR@
-LO_SRCDIR = @SRC_ROOT@
-LO_WORKDIR = @WORKDIR@
-
-// These are actual Xcode-known settings. The corresponding autoconf
-// variables are prefixed with XCODE_ to make it clear in configure.ac
-// what they will be used for.
-ARCHS = @XCODE_ARCHS@
-VALID_ARCHS = @XCODE_ARCHS@
-CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@
-DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
-
-// These settings are edited in CustomTarget_Lo_Xcconfig.mk.
-LINK_LDFLAGS =
-OTHER_CFLAGS =
-OTHER_CPLUSPLUSFLAGS =
-SYMROOT = @WORKDIR@/ios/build
diff --git a/ios/LibreOfficeLight/lo_app.xcconfig.in b/ios/LibreOfficeLight/lo_app.xcconfig.in
deleted file mode 100644
index 08623d8a9067..000000000000
--- a/ios/LibreOfficeLight/lo_app.xcconfig.in
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- Mode: text; tab-width: 4; indent-tabs-mode: nil; word-wrap: nil -*-
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// Xcode configuration properties
-
-// To avoid confusion, the LO-specific ones that aren't as such used
-// by Xcode (but only expanded in option values) are prefixed with
-// LO_.
-
-LO_BUILDDIR = @BUILDDIR@
-LO_INSTDIR = @INSTDIR@
-LO_SRCDIR = @SRC_ROOT@
-LO_WORKDIR = @WORKDIR@
-
-// These are actual Xcode-known settings. The corresponding autoconf
-// variables are prefixed with XCODE_ to make it clear in configure.ac
-// what they will be used for.
-ARCHS = @XCODE_ARCHS@
-VALID_ARCHS = @XCODE_ARCHS@
-CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@
-DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
-
-// These settings are edited in CustomTarget_Lo_Xcconfig.mk.
-LINK_LDFLAGS =
-OTHER_CFLAGS =
-OTHER_CPLUSPLUSFLAGS =
-SYMROOT = @WORKDIR@/ios/build
diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index 8213054e8717..6cce1200b69c 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -11,8 +11,7 @@ $(eval $(call gb_Module_Module,ios))
ifeq ($(OS),IOS)
$(eval $(call gb_Module_add_targets,ios,\
- CustomTarget_Lo_Xcconfig \
- CustomTarget_LibreOfficeLight_app \
+ CustomTarget_setup \
))
endif
More information about the Libreoffice-commits
mailing list