summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-10-03 07:27:11 +0200
committerDavid Tardon <dtardon@redhat.com>2012-10-03 07:27:11 +0200
commitc7e559a1e6009fd8f3dcafcf9c47593d04382a13 (patch)
tree6c85e55e36e52e87124e8baa53551445ab010e08
parentae1f2f6b932d43e6770022039d9cbe3f3960ab27 (diff)
CLI assemblies must depend on the key file used for signing
Change-Id: I84c0044f3054388fd5650c14efd30f21481e493a
-rw-r--r--cli_ure/CliLibrary_cli_basetypes.mk2
-rw-r--r--cli_ure/CliLibrary_cli_ure.mk2
-rw-r--r--cli_ure/CliNativeLibrary_cli_cppuhelper.mk2
-rw-r--r--cli_ure/CliUnoApi_cli_uretypes.mk2
4 files changed, 8 insertions, 0 deletions
diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk
index d9f8a04d90c6..254720ca27ea 100644
--- a/cli_ure/CliLibrary_cli_basetypes.mk
+++ b/cli_ure/CliLibrary_cli_basetypes.mk
@@ -13,6 +13,8 @@ $(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_keyfile,cli_basetypes,$(OUTDIR)/bin/cliuno.snk))
+
$(eval $(call gb_CliLibrary_set_policy,cli_basetypes,$(CLI_BASETYPES_POLICY_ASSEMBLY),$(CLI_BASETYPES_POLICY_VERSION)))
$(eval $(call gb_CliLibrary_add_csfiles,cli_basetypes,\
diff --git a/cli_ure/CliLibrary_cli_ure.mk b/cli_ure/CliLibrary_cli_ure.mk
index 1b9c1163b9dd..fb5eaaae545a 100644
--- a/cli_ure/CliLibrary_cli_ure.mk
+++ b/cli_ure/CliLibrary_cli_ure.mk
@@ -13,6 +13,8 @@ $(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_keyfile,cli_ure,$(OUTDIR)/bin/cliuno.snk))
+
$(eval $(call gb_CliLibrary_set_policy,cli_ure,$(CLI_URE_POLICY_ASSEMBLY),$(CLI_URE_POLICY_VERSION)))
$(eval $(call gb_CliLibrary_use_assemblies,cli_ure,\
diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
index 23ed5fa8afbc..cea9b8b36637 100644
--- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
+++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
@@ -15,6 +15,8 @@ $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_nat
$(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config))
+$(eval $(clal gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(OUTDIR)/bin/clinuo.snk))
+
$(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION)))
$(eval $(call gb_CliNativeLibrary_use_assemblies,cli_cppuhelper,\
diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk
index af3566e92a29..f58bfd6e6694 100644
--- a/cli_ure/CliUnoApi_cli_uretypes.mk
+++ b/cli_ure/CliUnoApi_cli_uretypes.mk
@@ -15,6 +15,8 @@ $(eval $(call gb_CliUnoApi_set_assembly_version,cli_uretypes,$(CLI_URETYPES_NEW_
$(eval $(call gb_CliUnoApi_set_configfile,cli_uretypes,cli_ure/unotypes/cli_uretypes_config))
+$(eval $(call gb_CliUnoApi_set_keyfile,cli_uretypes,$(OUTDIR)/bin/cliuno.snk))
+
$(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBLY),$(CLI_URETYPES_POLICY_VERSION)))
$(eval $(call gb_CliUnoApi_wrap_api,cli_uretypes,udkapi))