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

[rodo svn gnome org]

Author: rodo
Date: Mon Jul 21 14:05:12 2008
New Revision: 13321
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13321&view=rev

Log:
2008-07-21  Radek Doulik  <rodo novell com>

	* cli_ure/source/bootstrap/makefile.mk: generate .config and
	policy files for cppuhelper dll. changes are in
	patches/mono/mono-bootstrap-config-and-policy.diff



Added:
   trunk/patches/mono/mono-bootstrap-config-and-policy.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 14:05:12 2008
@@ -1511,6 +1511,7 @@
 buildfix-use-climaker-in-unoil-m25.diff, rodo
 [ Mono >= dev300-m26 < beb300-m0 ]
 buildfix-use-climaker-in-unoil.diff, rodo
+mono-bootstrap-config-and-policy.diff, rodo
 
 [ Mono < dev300-m22 >= beb300-m1 ]
 mono-scp2-m21.diff

Added: trunk/patches/mono/mono-bootstrap-config-and-policy.diff
==============================================================================
--- (empty file)
+++ trunk/patches/mono/mono-bootstrap-config-and-policy.diff	Mon Jul 21 14:05:12 2008
@@ -0,0 +1,37 @@
+diff -rup cli_ure-orig-1/source/bootstrap/makefile.mk cli_ure/source/bootstrap/makefile.mk
+--- cli_ure-orig-1/source/bootstrap/makefile.mk	2008-07-21 15:10:12.000000000 +0200
++++ cli_ure/source/bootstrap/makefile.mk	2008-07-21 15:33:46.000000000 +0200
+@@ -58,10 +58,14 @@ ASSEMBLY_KEY="$(BIN)$/cliuno.snk"
+ 
+ ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_cppuhelper.cs
+ 
++POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_CPPUHELPER_POLICY_ASSEMBLY).dll
++
+ ALLTAR : \
+ 	$(SHL1TARGETN) \
+ 	$(ASSEMBLY_ATTRIBUTES) \
+-	$(BIN)$/cli_cppuhelper.dll
++	$(BIN)$/cli_cppuhelper.dll \
++	$(BIN)$/cli_cppuhelper.config \
++	$(POLICY_ASSEMBLY_FILE)
+ 
+ CSFILES = \
+ 	managed_bootstrap.cs \
+@@ -109,6 +113,17 @@ SHL1STDLIBS += $(MONO_LIBS)
+ 
+ SHL1TARGET = $(TARGET)
+ 
++$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
++	$(WRAPCMD) $(AL) -out:$@ \
++			-version:$(CLI_CPPUHELPER_POLICY_VERSION) \
++			-keyfile:$(BIN)$/cliuno.snk \
++			-link:cli_cppuhelper.config,$(BIN)$/cli_cppuhelper.config		
++
++#Create the config file that is used with the policy assembly
++$(BIN)$/cli_cppuhelper.config: ../native/cli_cppuhelper_config $(BIN)$/cliureversion.mk 
++	$(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
++	$< $@
++
+ .ENDIF
+ 
+ .INCLUDE : $(PRJ)$/util$/target.pmk