strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
The CliUnoApi_oootypes does not use the same version file as everything
else, so pass that in as a parameter.
This commit is contained in:
Michael Stahl 2017-11-23 23:40:04 +01:00
parent c850db6261
commit 9673dbf3a1
9 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli_ure/CliLibrary_cli_basetypes.mk
View file

@ -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))

2
cli_ure/CliLibrary_cli_ure.mk
View file

@ -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))

2
cli_ure/CliNativeLibrary_cli_cppuhelper.mk
View file

@ -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))

2
cli_ure/CliUnoApi_cli_uretypes.mk
View file

@ -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))

12
solenv/gbuild/CliAssembly.mk
View file

@ -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

2
solenv/gbuild/CliLibrary.mk
View file

@ -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

2
solenv/gbuild/CliNativeLibrary.mk
View file

@ -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

2
solenv/gbuild/CliUnoApi.mk
View file

@ -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

2
unoil/CliUnoApi_oootypes.mk
View file

@ -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))