You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by ru...@apache.org on 2001/08/16 14:08:38 UTC
cvs commit: jakarta-alexandria/proposal/gump/stylesheet build.xsl defaults.xsl win2k.xsl
rubys 01/08/16 05:08:38
Modified: proposal/gump/project jakarta-turbine-fulcrum.xml
proposal/gump/stylesheet build.xsl defaults.xsl win2k.xsl
Log:
Fulcrum needs to refer into the source directory of turbine in order to
build.
Revision Changes Path
1.6 +1 -0 jakarta-alexandria/proposal/gump/project/jakarta-turbine-fulcrum.xml
Index: jakarta-turbine-fulcrum.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-turbine-fulcrum.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jakarta-turbine-fulcrum.xml 2001/08/12 21:04:43 1.5
+++ jakarta-turbine-fulcrum.xml 2001/08/16 12:08:38 1.6
@@ -24,6 +24,7 @@
<depend property="commons-email.jar" project="commons-email"/>
<property name="jakarta-site2" reference="home" project="jakarta-site2"/>
+ <property name="turbine.dir" reference="srcdir" project="jakarta-turbine"/>
<property name="final.name" value="fulcrum-gump"/>
<property name="deprecation" value="on"/>
1.16 +7 -0 jakarta-alexandria/proposal/gump/stylesheet/build.xsl
Index: build.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/build.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xsl 2001/08/12 18:11:22 1.15
+++ build.xsl 2001/08/16 12:08:38 1.16
@@ -280,6 +280,13 @@
</xsl:if>
</xsl:when>
+ <xsl:when test="@reference='srcdir'">
+ <xsl:variable name="project" select="@project"/>
+ <xsl:for-each select="/workspace/project[@name=$project]">
+ <property name="{$name}" value="{$basedir}/{@srcdir}" type="path"/>
+ </xsl:for-each>
+ </xsl:when>
+
<xsl:when test="@path">
<property name="{$name}" value="{$basedir}/{ancestor::project/@srcdir}/{@path}" type="path"/>
</xsl:when>
1.7 +2 -1 jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl
Index: defaults.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- defaults.xsl 2001/08/12 18:11:22 1.6
+++ defaults.xsl 2001/08/16 12:08:38 1.7
@@ -154,7 +154,8 @@
<!-- Generate additional dependency entries, as needed -->
- <xsl:for-each select="ant/property[@project!=$project]">
+ <xsl:for-each select="ant/property[@project!=$project and
+ not(@reference='srcdir')]">
<xsl:variable name="dependency" select="@project"/>
<xsl:if test="not(../../depend[@project=$dependency])">
1.9 +8 -1 jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl
Index: win2k.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- win2k.xsl 2001/06/10 13:14:58 1.8
+++ win2k.xsl 2001/08/16 12:08:38 1.9
@@ -317,7 +317,14 @@
<xsl:text> -D</xsl:text>
<xsl:value-of select="@name"/>
<xsl:text>=</xsl:text>
- <xsl:value-of select="@value"/>
+ <xsl:choose>
+ <xsl:when test="@type='path'">
+ <xsl:value-of select="translate(@value,'/','\')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@value"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:for-each>
<xsl:choose>
---------------------------------------------------------------------
To unsubscribe, e-mail: alexandria-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: alexandria-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-alexandria/proposal/gump/stylesheet
build.xsl defaults.xsl win2k.xsl
Posted by Jason van Zyl <jv...@apache.org>.
On 8/16/01 8:08 AM, "rubys@apache.org" <ru...@apache.org> wrote:
> rubys 01/08/16 05:08:38
>
> Modified: proposal/gump/project jakarta-turbine-fulcrum.xml
> proposal/gump/stylesheet build.xsl defaults.xsl win2k.xsl
> Log:
> Fulcrum needs to refer into the source directory of turbine in order to
> build.
That is a bad coupling, sorry about that one Sam. Those references to the
turbine are bad and I didn't even think about because I thought I had
already removed them.
> Revision Changes Path
> 1.6 +1 -0
> jakarta-alexandria/proposal/gump/project/jakarta-turbine-fulcrum.xml
>
> Index: jakarta-turbine-fulcrum.xml
> ===================================================================
> RCS file:
> /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-turbine-fulcrum.xml
> ,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- jakarta-turbine-fulcrum.xml 2001/08/12 21:04:43 1.5
> +++ jakarta-turbine-fulcrum.xml 2001/08/16 12:08:38 1.6
> @@ -24,6 +24,7 @@
> <depend property="commons-email.jar" project="commons-email"/>
>
> <property name="jakarta-site2" reference="home" project="jakarta-site2"/>
> + <property name="turbine.dir" reference="srcdir"
> project="jakarta-turbine"/>
>
> <property name="final.name" value="fulcrum-gump"/>
> <property name="deprecation" value="on"/>
>
>
>
> 1.16 +7 -0 jakarta-alexandria/proposal/gump/stylesheet/build.xsl
>
> Index: build.xsl
> ===================================================================
> RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/build.xsl,v
> retrieving revision 1.15
> retrieving revision 1.16
> diff -u -r1.15 -r1.16
> --- build.xsl 2001/08/12 18:11:22 1.15
> +++ build.xsl 2001/08/16 12:08:38 1.16
> @@ -280,6 +280,13 @@
> </xsl:if>
> </xsl:when>
>
> + <xsl:when test="@reference='srcdir'">
> + <xsl:variable name="project" select="@project"/>
> + <xsl:for-each select="/workspace/project[@name=$project]">
> + <property name="{$name}" value="{$basedir}/{@srcdir}"
> type="path"/>
> + </xsl:for-each>
> + </xsl:when>
> +
> <xsl:when test="@path">
> <property name="{$name}"
> value="{$basedir}/{ancestor::project/@srcdir}/{@path}" type="path"/>
> </xsl:when>
>
>
>
> 1.7 +2 -1 jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl
>
> Index: defaults.xsl
> ===================================================================
> RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- defaults.xsl 2001/08/12 18:11:22 1.6
> +++ defaults.xsl 2001/08/16 12:08:38 1.7
> @@ -154,7 +154,8 @@
>
> <!-- Generate additional dependency entries, as needed -->
>
> - <xsl:for-each select="ant/property[@project!=$project]">
> + <xsl:for-each select="ant/property[@project!=$project and
> + not(@reference='srcdir')]">
>
> <xsl:variable name="dependency" select="@project"/>
> <xsl:if test="not(../../depend[@project=$dependency])">
>
>
>
> 1.9 +8 -1 jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl
>
> Index: win2k.xsl
> ===================================================================
> RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- win2k.xsl 2001/06/10 13:14:58 1.8
> +++ win2k.xsl 2001/08/16 12:08:38 1.9
> @@ -317,7 +317,14 @@
> <xsl:text> -D</xsl:text>
> <xsl:value-of select="@name"/>
> <xsl:text>=</xsl:text>
> - <xsl:value-of select="@value"/>
> + <xsl:choose>
> + <xsl:when test="@type='path'">
> + <xsl:value-of select="translate(@value,'/','\')"/>
> + </xsl:when>
> + <xsl:otherwise>
> + <xsl:value-of select="@value"/>
> + </xsl:otherwise>
> + </xsl:choose>
> </xsl:for-each>
>
> <xsl:choose>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: alexandria-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: alexandria-dev-help@jakarta.apache.org
--
jvz.
Jason van Zyl
http://tambora.zenplex.org
http://jakarta.apache.org/turbine
http://jakarta.apache.org/velocity
http://jakarta.apache.org/alexandria
http://jakarta.apache.org/commons
---------------------------------------------------------------------
To unsubscribe, e-mail: alexandria-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: alexandria-dev-help@jakarta.apache.org