diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-11-23 23:40:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-11-24 01:27:37 +0100 |
| commit | 9673dbf3a19740b22ecb99721dab9b03cae76509 (patch) | |
| tree | 5a13cf0bac278305200b3664b2a5b487459e17fd /solenv | |
| parent | c850db62618b9c53b21ae3e13bf52df91ea93bbd (diff) | |
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.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CliAssembly.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/CliLibrary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CliNativeLibrary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CliUnoApi.mk | 2 |
4 files changed, 8 insertions, 10 deletions
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 |