You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/07/12 15:34:22 UTC
svn commit: r555622 - in /lenya/trunk/src: resources/build/modules2build.xsl
targets/modules-build.xml
Author: nettings
Date: Thu Jul 12 06:34:21 2007
New Revision: 555622
URL: http://svn.apache.org/viewvc?view=rev&rev=555622
Log:
commit build patch by josias.
it attempts to work around an xslt transformer bug under windows, which
prevents a build on windows. see
http://issues.apache.org/bugzilla/show_bug.cgi?id=40113
windows users, please review. this should now work for both jdk 1.4 and
1.5+...
Modified:
lenya/trunk/src/resources/build/modules2build.xsl
lenya/trunk/src/targets/modules-build.xml
Modified: lenya/trunk/src/resources/build/modules2build.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/resources/build/modules2build.xsl?view=diff&rev=555622&r1=555621&r2=555622
==============================================================================
--- lenya/trunk/src/resources/build/modules2build.xsl (original)
+++ lenya/trunk/src/resources/build/modules2build.xsl Thu Jul 12 06:34:21 2007
@@ -16,8 +16,6 @@
limitations under the License.
-->
-<!-- $Id: global-sitemap.xmap 393761 2006-04-13 08:38:00Z michi $ -->
-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:mod="http://apache.org/lenya/module/1.0"
xmlns:list="http://apache.org/lenya/module-list/1.0">
@@ -64,7 +62,7 @@
<xsl:variable name="compileDependencyList">
<xsl:for-each select="list:module">
- <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="call"/>
+ <xsl:apply-templates select="mod:module" mode="call"/>
<xsl:call-template name="separator"/>
</xsl:for-each>
</xsl:variable>
@@ -72,7 +70,7 @@
<xsl:variable name="testDependencyList">
<xsl:for-each select="list:module">
- <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="patch-test"/>
+ <xsl:apply-templates select="mod:module" mode="patch-test"/>
<xsl:call-template name="separator"/>
</xsl:for-each>
</xsl:variable>
@@ -89,7 +87,7 @@
<xsl:variable name="canooDependencyList">
<xsl:for-each select="list:module">
- <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="test-canoo"/>
+ <xsl:apply-templates select="mod:module" mode="test-canoo"/>
<xsl:call-template name="separator"/>
</xsl:for-each>
</xsl:variable>
@@ -113,7 +111,7 @@
<xsl:template match="list:module" mode="call-test">
- <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="call-test"/>
+ <xsl:apply-templates select="mod:module" mode="call-test"/>
</xsl:template>
<xsl:template match="mod:module" mode="call-test">
@@ -122,7 +120,7 @@
<xsl:template match="list:module" mode="call-test-canoo">
- <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="call-test-canoo"/>
+ <xsl:apply-templates select="mod:module" mode="call-test-canoo"/>
</xsl:template>
<xsl:template match="mod:module" mode="call-test-canoo">
@@ -136,7 +134,7 @@
<xsl:template match="list:module" mode="call-javadocs">
- <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="call-javadocs"/>
+ <xsl:apply-templates select="mod:module" mode="call-javadocs"/>
</xsl:template>
<xsl:template match="mod:module" mode="call-javadocs">
@@ -145,7 +143,7 @@
<xsl:template match="list:module" mode="target">
- <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="target">
+ <xsl:apply-templates select="mod:module" mode="target">
<xsl:with-param name="src" select="@src"/>
</xsl:apply-templates>
</xsl:template>
Modified: lenya/trunk/src/targets/modules-build.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/modules-build.xml?view=diff&rev=555622&r1=555621&r2=555622
==============================================================================
--- lenya/trunk/src/targets/modules-build.xml (original)
+++ lenya/trunk/src/targets/modules-build.xml Thu Jul 12 06:34:21 2007
@@ -36,11 +36,17 @@
moduleDirs="${modules.root.dirs}"
moduleFile="${build.dir}/temp/modules.xml"/>
+ <!-- aggregate all module config files to one file: -->
<xslt
in="${build.dir}/temp/modules.xml"
+ out="${build.dir}/temp/modules-config.xml"
+ style="${src.resource.dir}/build/modules2config.xsl">
+ </xslt>
+
+ <xslt
+ in="${build.dir}/temp/modules-config.xml"
out="${build.dir}/temp/modules-build.xml"
style="${src.resource.dir}/build/modules2build.xsl">
- <factory name="org.apache.xalan.xsltc.trax.TransformerFactoryImpl" />
<param name="cocoon-xconf" expression="${cocoon.xconf}" />
<param name="module-schema" expression="${src.resource.dir}/build/module.rng"/>
<param name="copy-modules" expression="${modules.copy}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org