[ooo-build-commit] .: Branch 'ooo-build-3-2' - 2 commits - patches/dev300

[Fridrich Strba]

 patches/dev300/apply                       |    4 ++
 patches/dev300/connectivity-build-fix.diff |   49 +++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

New commits:
commit 6efa909bb3b45a5c45741fead4cb3570953873d9
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 27 15:15:44 2010 +0100

    Don't apply for a milestone before m11
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8046442..698aef7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3506,6 +3506,6 @@ evaluation-row-limit.diff
 # TODO: split up into the original patches were this belongs
 valgrind-fixes.diff, thorsten
 
-[ BuildBits < ooo320-m12 ]
+[ BuildBits < ooo320-m12 >= ooo320-m11 ]
 connectivity-build-fix.diff, i#107957, fridrich
 
commit 901f345397cf0f42b609b4d5652f9a8aa049f76a
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 27 15:12:00 2010 +0100

    Fix a build breakages with build where --with-lang is not specified
    
    * patches/dev300/apply:
    * patches/dev300/connectivity-build-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0071885..8046442 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3505,3 +3505,7 @@ evaluation-row-limit.diff
 [ Fixes ]
 # TODO: split up into the original patches were this belongs
 valgrind-fixes.diff, thorsten
+
+[ BuildBits < ooo320-m12 ]
+connectivity-build-fix.diff, i#107957, fridrich
+
diff --git a/patches/dev300/connectivity-build-fix.diff b/patches/dev300/connectivity-build-fix.diff
new file mode 100644
index 0000000..f36c43a
--- /dev/null
+++ b/patches/dev300/connectivity-build-fix.diff
@@ -0,0 +1,49 @@
+--- connectivity/prj/d.lst
++++ connectivity/prj/d.lst
+@@ -28,7 +28,7 @@
+ ..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
+ ..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx
+ #..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk
+-..\%__SRC%\misc\merge\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
++..\%__SRC%\misc\lang\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
+ ..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
+ ..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
+ 
+--- connectivity/util/makefile.mk
++++ connectivity/util/makefile.mk
+@@ -47,6 +47,7 @@
+ DIR_LANG_SOURCE  := $(MISC)$/registry$/data
+ .ENDIF
+ DRIVER_MERGE_XCU := $(shell -@$(FIND) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess -name "*.xcu")
++DRIVER_MERGE_DEST = $(MISC)/lang/{$(DRIVER_MERGE_XCU:f)}
+    
+ REALFILTERPACKAGES_FILTERS_UI_LANGPACKS = \
+     $(foreach,i,$(alllangiso) $(foreach,j,$(DRIVER_MERGE_XCU) $(DIR_LANGPACK)$/$i$/org$/openoffice$/Office$/DataAccess$/$(j:f)))
+@@ -76,5 +77,26 @@
+ 
+ ALLTAR: \
+     $(MISC)$/$(TARGET)_delzip \
+-    $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip
++	$(BIN)$/fcfg_drivers_{$(alllangiso)}.zip \
++    $(MISC)/lastlang.mk
++
++.IF "$(DRIVER_MERGE_DEST)"!=""
++.INCLUDE .IGNORE : $(MISC)/lastlang.mk
++
++ALLTAR : \
++    $(DRIVER_MERGE_DEST)
++
++.IF "$(LAST_LANGS)"!="$(WITH_LANG)"
++DO_PHONY=.PHONY
++.ENDIF          # "$(LAST_LANG)"!="$(WITH_LANG)"
++
++$(MISC)/lang/%.xcu $(DO_PHONY) : $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess/%.xcu
++    @@-$(MKDIRHIER) $(@:d:d)
++    $(COPY) $< $@
++
++.ENDIF          # "$(DRIVER_MERGE_DEST)"!=""
++
++$(MISC)/lastlang.mk $(DO_PHONY) :
++    $(RM) $@
++    echo LAST_LANGS=$(WITH_LANG) > $@
+