From 8865b7f013bcd9b4ce41dd98be28ba28aeb22e66 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 28 Oct 2012 21:20:14 +0100
Subject: 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
---
 scp2/source/ooo/ure.scp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 scp2/source/ooo/ure.scp

(limited to 'scp2')

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
old mode 100644
new mode 100755
index be2c52f4d78f..a53ddcb6abb6
--- 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";
-- 
cgit v1.2.3