ooo-build r14544 - in trunk: . patches/dev300 patches/mono

[rodo svn gnome org]

Author: rodo
Date: Wed Nov 19 13:43:43 2008
New Revision: 14544
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14544&view=rev

Log:
2008-11-19  Radek Doulik  <rodo novell com>

	* patches/dev300/apply: added mono-bridge-version.diff, fixes
	n#361463. Adds version info to cli_uno_bridge.dll assembly (mono
	bridge).




Added:
   trunk/patches/mono/mono-bridge-version.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Nov 19 13:43:43 2008
@@ -1599,6 +1599,7 @@
 climaker-csharp-win.diff, rodo
 buildfix-climaker-disabled.diff, rodo
 mono-bootstrap-config-and-policy.diff, rodo
+mono-bridge-version.diff, n#361463, rodo
 
 buildfix-use-climaker-in-unoil.diff, rodo
 

Added: trunk/patches/mono/mono-bridge-version.diff
==============================================================================
--- (empty file)
+++ trunk/patches/mono/mono-bridge-version.diff	Wed Nov 19 13:43:43 2008
@@ -0,0 +1,31 @@
+diff -rup ../ooo300-m9-old/cli_ure/source/mono_bridge/makefile.mk cli_ure/source/mono_bridge/makefile.mk
+--- ../ooo300-m9-old/cli_ure/source/mono_bridge/makefile.mk	2008-11-19 13:32:37.000000000 +0100
++++ cli_ure/source/mono_bridge/makefile.mk	2008-11-19 12:18:45.000000000 +0100
+@@ -84,6 +84,7 @@ ALLTAR : 				\
+ 	$(BIN)$/cli_uno_bridge.dll
+ 
+ CSFILES= 			\
++	assemblyinfo.cs		\
+ 	binaryuno.cs 		\
+ 	bridge.cs 		\
+ 	cli_environment.cs 	\
+diff -rup ../ooo300-m9-old/cli_ure/source/mono_bridge/mono_bridge.cxx cli_ure/source/mono_bridge/mono_bridge.cxx
+--- ../ooo300-m9-old/cli_ure/source/mono_bridge/mono_bridge.cxx	2008-11-19 13:32:37.000000000 +0100
++++ cli_ure/source/mono_bridge/mono_bridge.cxx	2008-11-19 12:14:34.000000000 +0100
+@@ -254,7 +254,7 @@ Bridge::Bridge(
+ {
+     MonoDomain * pDomain = mono_get_root_domain();
+     // FIXME where is this freed?
+-    MonoAssembly * pAssembly = DoLoad (pDomain, "cli_uno_bridge, Version=0.0.0.0, Culture=neutral, PublicKeyToken=ce2cb7e279207b9e");
++    MonoAssembly * pAssembly = DoLoad (pDomain, "cli_uno_bridge, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ce2cb7e279207b9e");
+     // FIXME and this, is this needed later?
+     MonoClass * pClass = mono_class_from_name (
+         (MonoImage *)mono_assembly_get_image( pAssembly ), "com.sun.star.bridges.mono_uno", "Bridge" );
+diff -Nrup ../ooo300-m9-old/cli_ure/source/mono_bridge//assemblyinfo.cs cli_ure/source/mono_bridge//assemblyinfo.cs
+--- ../ooo300-m9-old/cli_ure/source/mono_bridge//assemblyinfo.cs	1970-01-01 01:00:00.000000000 +0100
++++ cli_ure/source/mono_bridge//assemblyinfo.cs	2008-11-19 12:13:51.000000000 +0100
+@@ -0,0 +1,4 @@
++using System.Reflection;
++using System.Runtime.CompilerServices;
++
++[assembly: AssemblyVersion("1.0.0.0")]