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

4 files changed, 18 insertions, 18 deletions

diff --git a/Repository.mk b/Repository.mk
index ed4a0fbae869..f01ee7395e0a 100644..100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -405,13 +405,13 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 ))
 
 endif
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
     affine_uno \
-	cli_cppuhelper_native \
+	cli_cppuhelper \
 	cli_uno \
 	gcc3_uno \
 	java_uno \
     jpipe \
     juh \
     juhx \
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
@@ -6,22 +6,22 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
 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 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk
index 72ddeb1fc593..f757fa39b528 100644..100755
--- a/cli_ure/Library_cli_cppuhelper_native.mk
+++ b/cli_ure/Library_cli_cppuhelper_native.mk
@@ -6,62 +6,62 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
 include $(SRCDIR)/cli_ure/version/version.txt
 
-$(eval $(call gb_Library_Assembly,cli_cppuhelper_native))
+$(eval $(call gb_Library_Assembly,cli_cppuhelper))
 
 # When compiling for CLR, disable "warning C4339: use of undefined type detected
 # in CLR meta-data - use of this type may lead to a runtime exception":
-$(eval $(call gb_Library_add_cxxflags,cli_cppuhelper_native,\
+$(eval $(call gb_Library_add_cxxflags,cli_cppuhelper,\
 	-AI $(gb_Helper_OUTDIRLIBDIR) \
 	-clr \
 	-wd4339 \
 ))
 
-$(eval $(call gb_Library_add_ldflags,cli_cppuhelper_native,\
+$(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\
 	-ignore:4248 \
 	-keyfile:$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk) \
 ))
 
 # TODO do not encode filenames here
-$(eval $(call gb_Library_add_ldflags,cli_cppuhelper_native,\
+$(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\
 	-delayload:cppuhelper3MSC.dll \
 	-delayload:cppu3.dll \
 	-delayload:sal3.dll \
 ))
 
-$(eval $(call gb_Library_use_internal_bootstrap_api,cli_cppuhelper_native,\
+$(eval $(call gb_Library_use_internal_bootstrap_api,cli_cppuhelper,\
 	udkapi \
 ))
 
-$(eval $(call gb_Library_use_packages,cli_cppuhelper_native,\
+$(eval $(call gb_Library_use_packages,cli_cppuhelper,\
 	cli_ure_cliuno \
 ))
 
-$(eval $(call gb_Library_use_libraries,cli_cppuhelper_native,\
+$(eval $(call gb_Library_use_libraries,cli_cppuhelper,\
 	cppu \
 	cppuhelper \
 	sal \
 ))
 
-$(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper_native,\
+$(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper,\
 	advapi32 \
 	delayimp \
 	mscoree \
 	$(if $(USE_DEBUG_RUNTIME)\
 		,msvcmrtd \
 		,msvcmrt \
 	) \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,cli_cppuhelper_native,\
+$(eval $(call gb_Library_add_exception_objects,cli_cppuhelper,\
 	cli_ure/source/native/native_bootstrap \
 	cli_ure/source/native/path \
 ))
 
-$(eval $(call gb_Library_add_generated_exception_objects,cli_cppuhelper_native,\
+$(eval $(call gb_Library_add_generated_exception_objects,cli_cppuhelper,\
 	CustomTarget/cli_ure/source/native/assembly \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index be2c52f4d78f..a53ddcb6abb6 100644..100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -589,13 +589,13 @@ End
 
 #if defined _MSC_VER
 
 File gid_File_Lib_Cli_Cppuhelper_Assembly
     TXT_FILE_BODY;
     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "cli_cppuhelper.dll";
+    Name = "assembly/cli_cppuhelper.dll";
     Dir = SCP2_URE_DL_DIR;
     Assemblyname = "cli_cppuhelper";
     PublicKeyToken = "ce2cb7e279207b9e";
     Version = "${CLI_CPPUHELPER_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";