diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-11-23 23:40:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-24 17:19:50 +0100 |
| commit | 2c3a33bb99274d25f0413815b8ecd9ce0fb4ea50 (patch) | |
| tree | 19b2dd4d0f5f56e0c082548bdd04c8b16bcee224 /cli_ure | |
| parent | 8be272b6642611e152ddc8e13f8570d2e673e0b4 (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.
(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>
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/CliLibrary_cli_basetypes.mk | 2 | ||||
| -rw-r--r-- | cli_ure/CliLibrary_cli_ure.mk | 2 | ||||
| -rw-r--r-- | cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 2 | ||||
| -rw-r--r-- | cli_ure/CliUnoApi_cli_uretypes.mk | 2 |
4 files changed, 4 insertions, 4 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)) |