CWS-TOOLING: integrate CWS sb111

4 files changed, 29 insertions, 101 deletions

diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 8b5aaa1c60eb..e116ee5740ac 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -28,6 +28,6 @@ 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\lang\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
+..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.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/delzip b/connectivity/util/delzip
deleted file mode 100755
index e69de29bb2d1..000000000000
--- a/connectivity/util/delzip
+++ /dev/null
diff --git a/connectivity/util/langfilter.xsl b/connectivity/util/langfilter.xsl
deleted file mode 100755
index 76cfcff20ac6..000000000000
--- a/connectivity/util/langfilter.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oor="http://openoffice.org/2001/registry">
-<xsl:output method="xml" indent="yes" omit-xml-declaration="no" version="1.0" encoding="UTF-8"/>
-<xsl:param name="lang"/>
-<xsl:template match="*">
-    <xsl:if test="count(.//*[@xml:lang=$lang])&gt;0">
-    <xsl:copy>
-        <xsl:apply-templates select="*|@*"/>
-    </xsl:copy>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="@*">
-    <xsl:copy>
-        <xsl:apply-templates select="*|@*"/>
-    </xsl:copy>
-</xsl:template>
-
-<xsl:template match="value">
-    <xsl:if test="@xml:lang=$lang">
-    <xsl:copy>
-        <xsl:apply-templates select="@*|text()"/>
-    </xsl:copy>
-    </xsl:if>
-</xsl:template>
- 
-<xsl:template match="text()">
-    <xsl:if test="../@xml:lang=$lang">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|text()"/>
-        </xsl:copy>
-    </xsl:if>
-</xsl:template>
-
-
-</xsl:stylesheet>
-
diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk
index 45d80fc049ff..d92fe00bba24 100755
--- a/connectivity/util/makefile.mk
+++ b/connectivity/util/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -23,75 +23,40 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
+#***********************************************************************/
 
-PRJ     = ..
-TARGET  = connectivity
+PRJ = ..
 PRJNAME = connectivity
+TARGET = connectivity
 
-# -----------------------------------------------------------------------------
-# include global settings
-# -----------------------------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-DIR_FILTERCFGOUT := $(MISC)$/drivers
-DIR_LANGPACK     := $(DIR_FILTERCFGOUT)
-.IF "$(WITH_LANG)"!=""
-DIR_LANG_SOURCE  := $(MISC)$/merge
-.ELSE
-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)))
-
-.INCLUDE: target.mk
+.INCLUDE : settings.mk
+.INCLUDE : target.mk
 
-PACKLANG := $(XSLTPROC) --nonet
-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) > $@
+# For any given platform, for each driver .xcu (in $(MY_XCUS)) built on that
+# platform (in $(MISC)/registry/data/org/openoffice/Office/DataAccess) there are
+# corresponding language-specific .xcu files (in
+# $(MISC)/registry/res/%/org/openoffice/Office/DataAccess).  For each language,
+# all language-specific .xcu files for that language are assembled into
+# $(BIN)$/fcfg_drivers_%.zip.  To meet the requirements of dmake percent rules,
+# the first item from $(MY_XCUS) is arbitrarily taken to be the main
+# prerequisite while all the items from $(MY_XCUS) are made into indirect
+# prerequisites (harmlessly doubling the first item).
 
-$(MISC)$/$(TARGET)_delzip :
-    -$(RM) $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip	
+MY_XCUS := \
+    $(shell cd $(MISC)/registry/data/org/openoffice/Office/DataAccess && \
+    ls *.xcu)
 
-$(BIN)$/fcfg_drivers_{$(alllangiso)}.zip : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS)
-    cd $(DIR_FILTERCFGOUT)$/$(@:b:s/fcfg_drivers_//) && zip -ru ..$/..$/..$/bin$/fcfg_drivers_$(@:b:s/fcfg_drivers_//).zip org/*
-.IF "$(USE_SHELL)"!="4nt"
-    $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
-.ENDIF			# "$(USE_SHELL)"!="4nt"
+.IF "$(MY_XCUS)" != ""
 
-ALLTAR: \
-    $(MISC)$/$(TARGET)_delzip \
-    $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip \
-    $(MISC)/lastlang.mk
+ALLTAR : $(BIN)/fcfg_drivers_{$(alllangiso)}.zip
 
-.IF "$(DRIVER_MERGE_DEST)"!=""
-.INCLUDE .IGNORE : $(MISC)/lastlang.mk
+$(BIN)/fcfg_drivers_{$(alllangiso)}.zip : \
+        $(MISC)/registry/res/$$(@:b:s/fcfg_drivers_//)/org/openoffice/Office/DataAccess/{$(MY_XCUS)}
 
-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) > $@
+$(BIN)/fcfg_drivers_%.zip : \
+        $(MISC)/registry/res/%/org/openoffice/Office/DataAccess/$(MY_XCUS:1)
+    zip -j $@ \
+        $(foreach,i,$(MY_XCUS) \
+            $(MISC)/registry/res/$*/org/openoffice/Office/DataAccess/$i)
 
+.ENDIF