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

[rodo svn gnome org]

Author: rodo
Date: Wed Jul 16 15:35:00 2008
New Revision: 13250
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13250&view=rev

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

	* patches/dev300/apply: added
	buildfix-use-climaker-in-unoil.diff. fixes build of cli_ure and
	unoil modules. deliver staticaly bundled climaker and use it in
	unoil. also workaround al problem



Added:
   trunk/patches/mono/buildfix-use-climaker-in-unoil.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul 16 15:35:00 2008
@@ -1455,6 +1455,7 @@
 mono-climaker.diff, rodo
 climaker-csharp-win.diff, rodo
 buildfix-climaker-disabled.diff, rodo
+buildfix-use-climaker-in-unoil.diff, rodo
 
 [ Mono < dev300-m22 >= beb300-m1 ]
 mono-scp2-m21.diff

Added: trunk/patches/mono/buildfix-use-climaker-in-unoil.diff
==============================================================================
--- (empty file)
+++ trunk/patches/mono/buildfix-use-climaker-in-unoil.diff	Wed Jul 16 15:35:00 2008
@@ -0,0 +1,77 @@
+diff -rup cli_ure-orig/prj/d.lst cli_ure/prj/d.lst
+--- cli_ure-orig/prj/d.lst	2008-07-16 16:47:01.000000000 +0200
++++ cli_ure/prj/d.lst	2008-07-16 16:47:32.000000000 +0200
+@@ -1,4 +1,5 @@
+ ..\%__SRC%\bin\climaker.exe %_DEST%\bin%_EXT%\climaker.exe
++..\%__SRC%\bin\climaker %_DEST%\bin%_EXT%\climaker
+ ..\%__SRC%\bin\climaker.pdb %_DEST%\bin%_EXT%\climaker.pdb
+ ..\%__SRC%\bin\climaker.exe.config %_DEST%\bin%_EXT%\climaker.exe.config
+ 
+diff -rup cli_ure-orig/source/climaker/makefile.mk cli_ure/source/climaker/makefile.mk
+--- cli_ure-orig/source/climaker/makefile.mk	2008-07-16 16:47:01.000000000 +0200
++++ cli_ure/source/climaker/makefile.mk	2008-07-16 17:02:55.000000000 +0200
+@@ -62,7 +62,7 @@ ALLTAR : $(BIN)$/climaker
+ 
+ $(BIN)$/climaker : climaker_csharp.cs
+ 	gmcs -debug -unsafe climaker_csharp.cs -reference:$(BIN)/cli_basetypes.dll -out:$(BIN)$/climaker.exe
+-	mkbundle2 --static -o $(BIN)$/climaker $(BIN)$/climaker.exe -L $(OUT)/lib
++	mkbundle2 --static -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll
+  
+ .INCLUDE :  target.mk
+ .ENDIF
+diff -rup unoil-orig/climaker/makefile.mk unoil/climaker/makefile.mk
+--- unoil-orig/climaker/makefile.mk	2008-07-16 16:19:13.000000000 +0200
++++ unoil/climaker/makefile.mk	2008-07-16 17:18:18.000000000 +0200
+@@ -45,7 +45,7 @@ TARGET = unotypes
+ 
+ POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
+ 
+-.IF "$(BUILD_FOR_CLI)" != ""
++.IF "$(BUILD_FOR_CLI)" != "" || "$(ENABLE_MONO_CLIMAKER)" == "YES"
+ 
+ ALLTAR : \
+ 	$(BIN)$/clioootypesversion.mk \
+@@ -59,6 +59,16 @@ ALLTAR : \
+ 
+ .ENDIF
+ 
++.IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
++
++CLIMAKER=$(SOLARBINDIR)$/climaker
++
++.ELSE
++
++CLIMAKER=$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe
++
++.ENDIF
++
+ 	
+ CLIMAKERFLAGS =
+ .IF "$(debug)" != ""
+@@ -69,7 +79,7 @@ RDB = $(SOLARBINDIR)$/offapi.rdb
+ EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
+ 
+ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) 
+-	$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe $(CLIMAKERFLAGS) \
++	$(CLIMAKER) $(CLIMAKERFLAGS) \
+ 		--out $@ \
+  		--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
+ 		--assembly-company "OpenOffice.org" \
+@@ -86,10 +96,13 @@ $(BIN)$/cli_oootypes.config: cli_oootype
+ 	$< $@
+ 
+ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oootypes.config $(BIN)$/cli_oootypes.dll
+-	$(WRAPCMD) AL.exe -out:$@ \
+-			-version:$(CLI_OOOTYPES_POLICY_VERSION) \
+-			-keyfile:$(SOLARBINDIR)$/cliuno.snk \
+-			-link:$(BIN)$/cli_oootypes.config
++	# al in mono seems broken and doesn't allow -link with filenames containing path
++	$(GNUCOPY) $(BIN)$/cli_oootypes.config .
++	$(WRAPCMD) $(AL) -out:$@ \
++			 -version:$(CLI_OOOTYPES_POLICY_VERSION) \
++			 -keyfile:$(SOLARBINDIR)$/cliuno.snk \
++			 -link:cli_oootypes.config
++	$(RM) cli_oootypes.config
+ 
+ #always deliver a clioootypesversion.mk. It is needed for the packing process even for all other
+ #platforms. Therefore BUILD_FOR_CLI is not used here