tdf#113787: always require version file with config for CLI assemblies

The CliUnoApi_oootypes does not use the same version file as everything
else, so pass that in as a parameter.

(cherry picked from commit 9673dbf3a19740b22ecb99721dab9b03cae76509)

Change-Id: Ic651a6011f7d78946e15d26da51f5ab2532bc90d
Reviewed-on: https://gerrit.libreoffice.org/45220
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

9 files changed, 13 insertions, 15 deletions

diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk
index 2d7b93737823..30f284fd5fbb 100644
--- a/cli_ure/CliLibrary_cli_basetypes.mk
+++ b/cli_ure/CliLibrary_cli_basetypes.mk
@@ -11,7 +11,7 @@ include $(SRCDIR)/cli_ure/version/version.txt
 
 $(eval $(call gb_CliLibrary_CliLibrary,cli_basetypes))
 
-$(eval $(call gb_CliLibrary_set_configfile,cli_basetypes,cli_ure/source/basetypes/cli_basetypes_config))
+$(eval $(call gb_CliLibrary_set_configfile,cli_basetypes,cli_ure/source/basetypes/cli_basetypes_config,cli_ure/version/version.txt))
 
 $(eval $(call gb_CliLibrary_set_keyfile,cli_basetypes,$(SRCDIR)/cli_ure/source/cliuno.snk))
 
diff --git a/cli_ure/CliLibrary_cli_ure.mk b/cli_ure/CliLibrary_cli_ure.mk
index c169d3c22829..1f320a02d160 100644
--- a/cli_ure/CliLibrary_cli_ure.mk
+++ b/cli_ure/CliLibrary_cli_ure.mk
@@ -11,7 +11,7 @@ include $(SRCDIR)/cli_ure/version/version.txt
 
 $(eval $(call gb_CliLibrary_CliLibrary,cli_ure))
 
-$(eval $(call gb_CliLibrary_set_configfile,cli_ure,cli_ure/source/ure/cli_ure_config))
+$(eval $(call gb_CliLibrary_set_configfile,cli_ure,cli_ure/source/ure/cli_ure_config,cli_ure/version/version.txt))
 
 $(eval $(call gb_CliLibrary_set_keyfile,cli_ure,$(SRCDIR)/cli_ure/source/cliuno.snk))
 
diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
index 5bc4f45e8b0a..0fa51671410a 100644
--- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
+++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CliNativeLibrary_CliNativeLibrary,cli_cppuhelper))
 
 $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper))
 
-$(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config))
+$(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config,cli_ure/version/version.txt))
 
 $(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk))
 
diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk
index 5748523ca8a8..c8bceb55b222 100644
--- a/cli_ure/CliUnoApi_cli_uretypes.mk
+++ b/cli_ure/CliUnoApi_cli_uretypes.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CliUnoApi_CliUnoApi,cli_uretypes))
 
 $(eval $(call gb_CliUnoApi_set_assembly_version,cli_uretypes,$(CLI_URETYPES_NEW_VERSION)))
 
-$(eval $(call gb_CliUnoApi_set_configfile,cli_uretypes,cli_ure/unotypes/cli_uretypes_config))
+$(eval $(call gb_CliUnoApi_set_configfile,cli_uretypes,cli_ure/unotypes/cli_uretypes_config,cli_ure/version/version.txt))
 
 $(eval $(call gb_CliUnoApi_set_keyfile,cli_uretypes,$(SRCDIR)/cli_ure/source/cliuno.snk))
 
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index f9cd42289f84..a0257708aead 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -12,8 +12,6 @@
 gb_CliConfigTarget_TARGET := $(SRCDIR)/solenv/bin/clipatchconfig.pl
 gb_CliConfigTarget_COMMAND := $(PERL) -w $(gb_CliConfigTarget_TARGET)
 
-gb_CliConfigTarget_VERSIONFILE_DEFAULT := $(SRCDIR)/cli_ure/version/version.txt
-
 define gb_CliConfigTarget__command
 $(call gb_Output_announce,$(2),$(true),CPA,1)
 $(call gb_Helper_abbreviate_dirs,\
@@ -35,11 +33,11 @@ $(call gb_CliConfigTarget_get_clean_target,%) :
 #
 # gb_CliConfigTarget_CliConfigTarget target source
 define gb_CliConfigTarget_CliConfigTarget
-$(call gb_CliConfigTarget_get_target,$(1)) : CLI_CONFIG_VERSIONFILE := $(gb_CliConfigTarget_VERSIONFILE_DEFAULT)
+$(call gb_CliConfigTarget_get_target,$(1)) : CLI_CONFIG_VERSIONFILE := $(3)
 
 $(call gb_CliConfigTarget_get_target,$(1)) : $(2)
 $(call gb_CliConfigTarget_get_target,$(1)) : $(gb_CliConfigTarget_TARGET)
-$(call gb_CliConfigTarget_get_target,$(1)) : $(gb_CliConfigTarget_VERSIONFILE_DEFAULT)
+$(call gb_CliConfigTarget_get_target,$(1)) : $(3)
 $(call gb_CliConfigTarget_get_target,$(1)) :| $(dir $(call gb_CliConfigTarget_get_target,$(1))).dir
 
 endef
@@ -170,19 +168,19 @@ $(call gb_Package_add_file,$(1)_assembly,$(notdir $(2)),$(subst $(WORKDIR)/,,$(2
 endef
 
 define gb_CliAssembly__set_configfile_impl
-$(call gb_CliAssemblyTarget_set_configfile,$(1),$(2))
+$(call gb_CliAssemblyTarget_set_configfile,$(1),$(2),$(3))
 $(call gb_CliAssembly__add_file,$(1),$(2))
 
 endef
 
 define gb_CliAssembly__set_configfile
-$(call gb_CliConfigTarget_CliConfigTarget,$(2),$(3))
+$(call gb_CliConfigTarget_CliConfigTarget,$(2),$(3),$(4))
 $(call gb_CliAssembly__set_configfile_impl,$(1),$(call gb_CliConfigTarget_get_target,$(2)),$(call gb_CliConfigTarget_get_clean_target,$(2)))
 
 endef
 
 define gb_CliAssembly_set_configfile
-$(call gb_CliAssembly__set_configfile,$(1),$(patsubst %_config,%,$(2)),$(SRCDIR)/$(2))
+$(call gb_CliAssembly__set_configfile,$(1),$(patsubst %_config,%,$(2)),$(SRCDIR)/$(2),$(SRCDIR)/$(3))
 
 endef
 
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 8c863a72e05a..e7fa508efada 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -82,7 +82,7 @@ $(call gb_CliLibrary_get_target,$(1)) :
 endef
 
 define gb_CliLibrary_set_configfile
-$(call gb_CliAssembly_set_configfile,$(1),$(2))
+$(call gb_CliAssembly_set_configfile,$(1),$(2),$(3))
 
 endef
 
diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk
index be2862151a02..6ff28ce6f842 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -63,7 +63,7 @@ $(call gb_CliNativeLibrary_get_target,$(1)) :
 endef
 
 define gb_CliNativeLibrary_set_configfile
-$(call gb_CliAssembly_set_configfile,$(1),$(2))
+$(call gb_CliAssembly_set_configfile,$(1),$(2),$(3))
 
 endef
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 16f331b48ec9..d12dc62f7998 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -67,7 +67,7 @@ $(call gb_CliUnoApi_get_target,$(1)) : $(gb_CliUnoApi_DEPS)
 endef
 
 define gb_CliUnoApi_set_configfile
-$(call gb_CliAssembly_set_configfile,$(1),$(2))
+$(call gb_CliAssembly_set_configfile,$(1),$(2),$(3))
 
 endef
 
diff --git a/unoil/CliUnoApi_oootypes.mk b/unoil/CliUnoApi_oootypes.mk
index 46201b7ac032..69d0a128f7da 100644
--- a/unoil/CliUnoApi_oootypes.mk
+++ b/unoil/CliUnoApi_oootypes.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_CliUnoApi_CliUnoApi,cli_oootypes))
 
 $(eval $(call gb_CliUnoApi_set_assembly_version,cli_oootypes,$(CLI_OOOTYPES_NEW_VERSION)))
 
-$(eval $(call gb_CliUnoApi_set_configfile,cli_oootypes,unoil/climaker/cli_oootypes_config))
+$(eval $(call gb_CliUnoApi_set_configfile,cli_oootypes,unoil/climaker/cli_oootypes_config,unoil/climaker/version.txt))
 
 $(eval $(call gb_CliUnoApi_set_keyfile,cli_oootypes,$(SRCDIR)/cli_ure/source/cliuno.snk))