solenv/gbuild/UnoApiTarget.mk | 9 ++++-----
solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 2 --
solenv/gbuild/platform/com_MSC_class.mk | 8 --------
solenv/gbuild/platform/iOS.mk | 8 --------
solenv/gbuild/platform/macosx.mk | 8 --------
solenv/gbuild/platform/solaris.mk | 8 --------
solenv/gbuild/platform/unxgcc.mk | 8 --------
7 files changed, 4 insertions(+), 47 deletions(-)
New commits:
commit f4aee67494aa4defbc4d23aebc41bf9571e29d3b
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Feb 23 13:29:02 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Feb 23 17:24:22 2024 +0100
Undo "move selection of UNO header variant to platform"
...from 86f4727920ae515987005e3c414f1d6056079be1, as all the platforms
define
gb_UnoApiHeadersTarget_select_variant in effectively the same way, anyway.
(And
whether or not any of this actually makes any sense the way it is currently
done.)
Change-Id: I3b53ed3ee58b1115da31839aba5b2852dfe40920
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163826
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 6eacbc66a0ab..e79247172851 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -90,9 +90,6 @@ endef
# UnoApiHeadersTarget
-# defined by platform
-# gb_UnoApiHeadersTarget_select_variant
-
# Allow to redefine header variant.
#
# On iOS we use static linking because dynamic loading of own code
@@ -125,8 +122,10 @@ endef
# technical reasons to get around silly limitations in the OS, sigh.
#
# gb_UnoApiHeadersTarget_select_variant api default-variant
-ifeq ($(origin gb_UnoApiHeadersTarget_select_variant),undefined)
-$(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be
defined by platform))
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+gb_UnoApiHeadersTarget_select_variant = $(if $(filter
udkapi,$(1)),comprehensive,$(2))
+else
+gb_UnoApiHeadersTarget_select_variant = $(2)
endif
gb_UnoApiHeadersTarget_CPPUMAKERDEPS := $(call
gb_Executable_get_runtime_dependencies,cppumaker)
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index ec762431097f..5d960db61087 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -7,8 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter
udkapi,$(1)),comprehensive,$(2))
-
include $(GBUILDDIR)/platform/unxgcc.mk
# don't sort; later can override previous settings!
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 16cc4201b40e..3ebbbabd49f9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -692,14 +692,6 @@ gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/license.txt
gb_UnpackedTarget_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))
-# UnoApiHeadersTarget class
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter
udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
# UIConfig class
# use responsefile because cui has too many files for command line
diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index 15f1ce4ef4ac..8a392c8505fe 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -241,14 +241,6 @@ gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION)
-# UnoApiHeadersTarget class
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter
udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
# UIMenubarTarget class
define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index be25f6563cd0..83f9695c624c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -345,14 +345,6 @@ gb_Extension_LICENSEFILE_DEFAULT :=
$(INSTROOT)/Resources/LICENSE
gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION)
-# UnoApiHeadersTarget class
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter
udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
# UIMenubarTarget class
define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 9d18cd913a87..c3e7af09f054 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -326,14 +326,6 @@ gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION)
-# UnoApiHeadersTarget class
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter
udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
# UIMenubarTarget class
define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 2cc3b2c24de6..a973a711d59a 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -415,14 +415,6 @@ gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION)
-# UnoApiHeadersTarget class
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter
udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
# UIMenubarTarget class
define gb_UIMenubarTarget__command
