diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-10-28 21:20:14 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2012-10-28 23:15:22 +0100 |
| commit | 8865b7f013bcd9b4ce41dd98be28ba28aeb22e66 (patch) | |
| tree | 904c2637d1427abbb8cae22d4542f89c859c0898 /cli_ure/CliNativeLibrary_cli_cppuhelper.mk | |
| parent | 0cc05a8f1db4c289dff0e95de6161cf3f3af58e6 (diff) | |
fdo#55290: use the right native library name
It turns out that the native library cannot be renamed after creation.
The right name must be used from the beginning, otherwise
publishing is failing with the follow error (gacutil -i):
"Failure adding assembly to the cache: Invalid file or assembly name.
The name of the file must be the name of the assembly plus .dll or .exe."
To rectify that create the native lib as cli_cppuhelper.dll,
rename the signed assembly to assembly/cli_cppuhelper.dll and
teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll
(and not cli_cppuhelper.dll).
Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
Diffstat (limited to 'cli_ure/CliNativeLibrary_cli_cppuhelper.mk')
| -rwxr-xr-x[-rw-r--r--] | cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk index dfc52baf33ce..f9889dccbca1 100644..100755 --- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk +++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk @@ -9,17 +9,17 @@ include $(SRCDIR)/cli_ure/version/version.txt -$(eval $(call gb_CliNativeLibrary_CliNativeLibrary,cli_cppuhelper)) +$(eval $(call gb_CliNativeLibrary_CliNativeLibrary,assembly/cli_cppuhelper)) -$(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_native)) +$(eval $(call gb_CliNativeLibrary_wrap_library,assembly/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,assembly/cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) -$(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk)) +$(eval $(call gb_CliNativeLibrary_set_keyfile,assembly/cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk)) -$(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) +$(eval $(call gb_CliNativeLibrary_set_policy,assembly/cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) -$(eval $(call gb_CliNativeLibrary_use_assemblies,cli_cppuhelper,\ +$(eval $(call gb_CliNativeLibrary_use_assemblies,assembly/cli_cppuhelper,\ cli_ure \ cli_uretypes \ )) |