[Libreoffice-commits] .: cli_ure/CliNativeLibrary_cli_cppuhelper.mk cli_ure/Library_cli_cppuhelper_native.mk Repository.mk scp2/source

[Libreoffice Gerrit user]

 Repository.mk                              |    2 +-
 cli_ure/CliNativeLibrary_cli_cppuhelper.mk |   12 ++++++------
 cli_ure/Library_cli_cppuhelper_native.mk   |   20 ++++++++++----------
 scp2/source/ooo/ure.scp                    |    2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 8865b7f013bcd9b4ce41dd98be28ba28aeb22e66
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sun Oct 28 21:20:14 2012 +0100

    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

diff --git a/Repository.mk b/Repository.mk
old mode 100644
new mode 100755
index ed4a0fb..f01ee73
--- a/Repository.mk
+++ b/Repository.mk
@@ -408,7 +408,7 @@ endif
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
     affine_uno \
-	cli_cppuhelper_native \
+	cli_cppuhelper \
 	cli_uno \
 	gcc3_uno \
 	java_uno \
diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
old mode 100644
new mode 100755
index dfc52ba..f9889dc
--- 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 \
 ))
diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk
old mode 100644
new mode 100755
index 72ddeb1..f757fa3
--- a/cli_ure/Library_cli_cppuhelper_native.mk
+++ b/cli_ure/Library_cli_cppuhelper_native.mk
@@ -9,43 +9,43 @@
 
 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 \
@@ -55,12 +55,12 @@ $(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper_native,\
 	) \
 ))
 
-$(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 \
 ))
 
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
old mode 100644
new mode 100755
index be2c52f..a53ddcb
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -592,7 +592,7 @@ End
 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";