sb111: #i101955# moved packregistry.xslt to solenv/bin (needed by additional Sun Hamburg processes)

2 files changed, 10 insertions, 92 deletions

diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index e879c24579d5..4b092e55647f 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -487,24 +487,23 @@ ALLTAR: \
     $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd \
     $(MISC)/lang/registry_{$(alllangiso)}.xcd
 
-$(MY_XCDS): packregistry.xslt
-
 $(MISC)/%.xcd .ERRREMOVE: $(MISC)/%.list
-    $(XSLTPROC) --nonet -o $@ packregistry.xslt $<
+    $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt $<
 
 $(MISC)/%.list: makefile.mk
     - $(RM) $@
     echo '<list>' $(foreach,i,$(MY_DEPS_$(@:b)) '<dependency file="$i"/>') \
         $(foreach,i,$(MY_FILES_$(@:b)) '<filename>$i</filename>') '</list>' > $@
 
-$(MISC)/lang/Langpack-%.xcd .ERRREMOVE: 'packregistry.xslt'
+$(MISC)/lang/Langpack-%.xcd .ERRREMOVE:
     $(MKDIRHIER) $(@:d)
     - $(RM) $(MISC)/$(@:b).list
     echo '<list><dependency file="main"/>\
         <filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
-    $(XSLTPROC) --nonet -o $@ packregistry.xslt $(MISC)/$(@:b).list
+    $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
+        $(MISC)/$(@:b).list
 
-$(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE: 'packregistry.xslt'
+$(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE:
     $(MKDIRHIER) $(@:d)
     rm -rf $(MISC)/$(@:b).unzip
     mkdir $(MISC)/$(@:b).unzip
@@ -513,9 +512,10 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE: 'packregistry.xslt'
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
         find $(@:b).unzip -name \*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
-    $(XSLTPROC) --nonet -o $@ packregistry.xslt $(MISC)/$(@:b).list
+    $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
+        $(MISC)/$(@:b).list
 
-$(MISC)/lang/registry_%.xcd .ERRREMOVE: packregistry.xslt
+$(MISC)/lang/registry_%.xcd .ERRREMOVE:
     $(MKDIRHIER) $(@:d)
     rm -rf $(MISC)/$(@:b).unzip
     mkdir $(MISC)/$(@:b).unzip
@@ -528,4 +528,5 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE: packregistry.xslt
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
         find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
-    $(XSLTPROC) --nonet -o $@ packregistry.xslt $(MISC)/$(@:b).list
+    $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
+        $(MISC)/$(@:b).list
diff --git a/postprocess/packregistry/packregistry.xslt b/postprocess/packregistry/packregistry.xslt
deleted file mode 100644
index 2d0d36174946..000000000000
--- a/postprocess/packregistry/packregistry.xslt
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2009 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.4 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-**********************************************************************-->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:oor="http://openoffice.org/2001/registry">
-  <xsl:strip-space elements="*"/>
-  <xsl:preserve-space elements="value"/>
-  <xsl:template match="/">
-    <oor:data xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-      <xsl:copy-of select="list/dependency"/>
-<!--
-      <xsl:copy-of select="document(list/filename)/oor:component-schema"/>
-      <xsl:copy-of select="document(list/filename)/oor:component-data"/>
-
-      instead of the below for-each would only issue warnings, not errors, for
-      non-existing or otherwise bad input files; it is important that the input
-      filename list is already sorted in an order suitable for the configmgr
-      (e.g., xcs files preceeding xcu files).
--->
-      <xsl:for-each select="list/filename">
-        <xsl:choose>
-          <xsl:when test="count(document(.)/oor:component-schema) = 1">
-            <xsl:apply-templates select="document(.)/oor:component-schema"/>
-          </xsl:when>
-          <xsl:when test="count(document(.)/oor:component-data) = 1">
-            <xsl:apply-templates select="document(.)/oor:component-data"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>cannot process </xsl:text>
-              <xsl:value-of select="."/>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </oor:data>
-  </xsl:template>
-  <xsl:template
-     match="oor:component-schema|oor:component-data|templates|component|group|
-            set|node-ref|prop|item|value|node">
-    <xsl:copy copy-namespaces="no">
-      <!-- prune oor:component-data xmlns:install="..." namespaces (would only
-           work in XSLT 2.0, however) -->
-      <xsl:for-each select="@*">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-  <xsl:template match="info|import|uses|constraints"/>
-    <!-- TODO: no longer strip elements when they are eventually read by
-         configmgr implementation -->
-</xsl:stylesheet>