[ooo-build-commit] 2 commits - patches/mono

[Tor Lillqvist]

 patches/mono/buildfix-use-climaker-in-unoil.diff |   11 ++++-------
 patches/mono/mono-climaker.diff                  |    4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 9bebe61ff47a37dedf56f12abde97fbb48b80708
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 15:29:06 2009 +0300

    Adapt buildfix-use-climaker-in-unoil.diff for dev300-m54
    
    * patches/mono/buildfix-use-climaker-in-unoil.diff: Adapt for
      dev300-m54.

diff --git a/patches/mono/buildfix-use-climaker-in-unoil.diff b/patches/mono/buildfix-use-climaker-in-unoil.diff
index d110acb..de2d9e5 100644
--- a/patches/mono/buildfix-use-climaker-in-unoil.diff
+++ b/patches/mono/buildfix-use-climaker-in-unoil.diff
@@ -17,8 +17,8 @@
   
  .INCLUDE :  target.mk
  .ENDIF # "$(ENABLE_MONO_CLIMAKER)" != "YES"
---- unoil/climaker/makefile.mk.old	2009-04-02 10:58:08.000000000 +0000
-+++ unoil/climaker/makefile.mk	2009-04-06 16:41:58.000000000 +0000
+--- unoil/climaker/makefile.mk
++++ unoil/climaker/makefile.mk
 @@ -45,7 +45,7 @@ TARGET = unotypes
  
  POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
@@ -45,7 +45,7 @@
  	
  CLIMAKERFLAGS =
  .IF "$(debug)" != ""
-@@ -68,8 +78,20 @@ CLIMAKERFLAGS += --verbose
+@@ -68,6 +78,18 @@ CLIMAKERFLAGS += --verbose
  RDB = $(SOLARBINDIR)$/offapi.rdb
  EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
  
@@ -62,11 +62,8 @@
 +.ELSE # .IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
 +
  $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
--	$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe $(CLIMAKERFLAGS) \
-+	$(CLIMAKER) $(CLIMAKERFLAGS) \
+ 		$(CLIMAKER) $(CLIMAKERFLAGS) \
  		--out $@ \
-  		--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
- 		--assembly-company "OpenOffice.org" \
 @@ -86,10 +108,16 @@ $(BIN)$/cli_oootypes.config: cli_oootype
  	$< $@
  
commit 586d175cb47e90b6bec0d3c0c8e07f233bb53f0c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 15:23:13 2009 +0300

    Adapt mono-climaker.diff for dev300-m54
    
    * patches/mono/mono-climaker.diff: Adapt for dev300-m54.

diff --git a/patches/mono/mono-climaker.diff b/patches/mono/mono-climaker.diff
index f207065..fa6955c 100644
--- a/patches/mono/mono-climaker.diff
+++ b/patches/mono/mono-climaker.diff
@@ -79,9 +79,9 @@
  
  #When changing the assembly version then this must also be done in scp2
 -$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
--	$(WRAPCMD) $(BIN)$/climaker.exe $(CLIMAKERFLAGS) \
+-	$(subst,$(SOLARBINDIR)$/climaker,$(BIN)$/climaker $(CLIMAKER)) $(CLIMAKERFLAGS) \
 +$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/$(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
-+	$(WRAPCMD) $(BIN)$/$(CLIMAKER) $(CLIMAKERFLAGS) \
++	$(subst,$(SOLARBINDIR)$/climaker,$(BIN)$/climaker $(CLIMAKER)) $(CLIMAKERFLAGS) \
  		--out $@ \
  		--keyfile $(BIN)$/cliuno.snk \
  		--assembly-version $(CLI_URETYPES_NEW_VERSION) \