[ooo-build-commit] .: Branch 'ooo/OOO320' - 2 commits - connectivity/prj connectivity/util desktop/source

[Jan Holesovsky]

 connectivity/prj/d.lst                                                            |    2 
 connectivity/util/makefile.mk                                                     |   37 +++++++---
 desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java |    2 
 3 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit f8938ac80275c4ad087f6cdece706528112c5b48
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Feb 1 14:39:38 2010 +0000

    CWS-TOOLING: integrate CWS ooo321gsl02
    2010-01-29 19:09:29 +0100 hjs  r277966 : #i107957 - deliver right .xcu, no matter how WITH_LANG is set
    2010-01-29 16:14:32 +0100 os  r277964 : #i108426# missing increment added
    2010-01-29 13:28:08 +0100 pl  r277962 : #i107763# avoid strange visuals on X11 platforms

diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 0d26223..8aa4fa3 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -28,7 +28,7 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
 ..\%__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
 
diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk
index 805aa01..2f252cb 100755
--- a/connectivity/util/makefile.mk
+++ b/connectivity/util/makefile.mk
@@ -47,7 +47,7 @@ DIR_LANG_SOURCE  := $(MISC)$/merge
 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)))
 
@@ -58,12 +58,12 @@ PACKLANG_IN :=
 PACKLANG_PARAM := --stringparam
 PACKLANG_XSL :=
     
-$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) : 
-      @echo ===================================================================
-      @echo Building language package for driver $(@:b:s/Filter_//) 
-      @echo ===================================================================
-      +-$(MKDIRHIER) $(@:d)
-      $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@
+$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) : 
+      @echo ===================================================================
+      @echo Building language package for driver $(@:b:s/Filter_//) 
+      @echo ===================================================================
+      +-$(MKDIRHIER) $(@:d)
+      $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@
 
 $(MISC)$/$(TARGET)_delzip :
     -$(RM) $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip	
@@ -76,5 +76,26 @@ $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip : $(REALFILTERPACKAGES_FILTERS_UI_LANGP
 
 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) > $@
 
commit bd729a6b8bda294fa78182d759497c9c7bc82023
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Feb 1 11:14:57 2010 +0000

    #i10000# fix missing assignment

diff --git a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
index 483369a..8f6b79d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
@@ -127,7 +127,7 @@ class WindowsSystemEnvironment extends SystemEnvironment {
         String mem = getWmicResult("computersystem", "get", "TotalPhysicalMemory");
         long l = 0;
         if (mem.length()>0)
-            Long.parseLong(mem);
+            l = Long.parseLong(mem);
         return "" + ((long) (l / (1024*1024)));
     }