diff options
| author | sb <sb@openoffice.org> | 2010-04-23 09:28:06 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-23 09:28:06 +0200 |
| commit | bae5315077ab904989aed65f9c37a9d1eb9153c2 (patch) | |
| tree | a76bb4eec0f797602a247bf1eace2079897d9ec9 /solenv/bin | |
| parent | d14f1802a4f4643ff3b555bc19be0a3723b290a3 (diff) | |
| parent | 26158a2e6ac5d93986e5d6c458d268aa8a697166 (diff) | |
sb122: merged in DEV300_m77 via cws/sb121
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 4 | ||||
| -rw-r--r-- | solenv/bin/packregistry.xslt | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 6f824f34ff0c..5ccedccb6027 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -44,6 +44,8 @@ sub action($$$) 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib', 'shl/OOO/OOO' => '@loader_path', 'shl/OXT/URELIB' => '@executable_path/urelibs', + 'shl/BOXT/URELIB' => '@executable_path/urelibs', + 'shl/BOXT/OOO' => '@loader_path/../../../../../../basis-link/program', 'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__', 'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__'); @@ -54,7 +56,7 @@ sub action($$$) } @ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die - 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|NONE <filepath>*'; + 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|BOXT|NONE <filepath>*'; $type = shift @ARGV; $loc = shift @ARGV; if ($type eq "extshl") diff --git a/solenv/bin/packregistry.xslt b/solenv/bin/packregistry.xslt index 76b4c5eeffe8..7c118f90136f 100644 --- a/solenv/bin/packregistry.xslt +++ b/solenv/bin/packregistry.xslt @@ -28,6 +28,7 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oor="http://openoffice.org/2001/registry"> + <xsl:param name="prefix"/> <xsl:strip-space elements="*"/> <xsl:preserve-space elements="value it"/> <!-- TODO: strip space from "value" elements that have "it" children --> @@ -45,12 +46,13 @@ (e.g., xcs files preceeding xcu files). --> <xsl:for-each select="list/filename"> + <xsl:variable name="doc" select="document(concat($prefix, .))"/> <xsl:choose> - <xsl:when test="count(document(.)/oor:component-schema) = 1"> - <xsl:apply-templates select="document(.)/oor:component-schema"/> + <xsl:when test="count($doc/oor:component-schema) = 1"> + <xsl:apply-templates select="$doc/oor:component-schema"/> </xsl:when> - <xsl:when test="count(document(.)/oor:component-data) = 1"> - <xsl:apply-templates select="document(.)/oor:component-data"/> + <xsl:when test="count($doc/oor:component-data) = 1"> + <xsl:apply-templates select="$doc/oor:component-data"/> </xsl:when> <xsl:otherwise> <xsl:message terminate="yes"> |