You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/03/20 21:07:17 UTC
svn commit: r158346 - in lenya/trunk/src: targets/dist-build.xml
targets/webapp-build.xml webapp/lenya/content/about.xml
webapp/lenya/content/introduction.xml webapp/lenya/pubs/blog/publication.xml
webapp/lenya/pubs/default/publication.xml
Author: gregor
Date: Sun Mar 20 12:07:15 2005
New Revision: 158346
URL: http://svn.apache.org/viewcvs?view=rev&rev=158346
Log:
Substitute Lenya version at build time. This resolves http://issues.apache.org/bugzilla/show_bug.cgi?id=33658
Modified:
lenya/trunk/src/targets/dist-build.xml
lenya/trunk/src/targets/webapp-build.xml
lenya/trunk/src/webapp/lenya/content/about.xml
lenya/trunk/src/webapp/lenya/content/introduction.xml
lenya/trunk/src/webapp/lenya/pubs/blog/publication.xml
lenya/trunk/src/webapp/lenya/pubs/default/publication.xml
Modified: lenya/trunk/src/targets/dist-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/dist-build.xml?view=diff&r1=158345&r2=158346
==============================================================================
--- lenya/trunk/src/targets/dist-build.xml (original)
+++ lenya/trunk/src/targets/dist-build.xml Sun Mar 20 12:07:15 2005
@@ -101,6 +101,14 @@
<exclude name="dist/**"/>
</fileset>
</copy>
+
+ <!-- Replace version placeholder with build version -->
+ <replace dir="${dist.src.dir}">
+ <include name="**/publication.xml"/>
+ <include name="**/introduction.xml"/>
+ <include name="**/about.xml"/>
+ <replacefilter token="@lenya.version@" value="${version}"/>
+ </replace>
</target>
<target name="dist-src" depends="prepare-dist-src" description="Builds a regular tar ball containing the sources for developers">
Modified: lenya/trunk/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/webapp-build.xml?view=diff&r1=158345&r2=158346
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Sun Mar 20 12:07:15 2005
@@ -147,6 +147,14 @@
<include name="**/*"/>
</fileset>
</copy>
+
+ <!-- Replace version placeholder with build version -->
+ <replace dir="${build.webapp}">
+ <include name="**/publication.xml"/>
+ <include name="**/introduction.xml"/>
+ <include name="**/about.xml"/>
+ <replacefilter token="@lenya.version@" value="${version}"/>
+ </replace>
<condition property="servlet.engine.tomcat">
<equals arg1="${web.app.server}" arg2="Tomcat"/>
Modified: lenya/trunk/src/webapp/lenya/content/about.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/content/about.xml?view=diff&r1=158345&r2=158346
==============================================================================
--- lenya/trunk/src/webapp/lenya/content/about.xml (original)
+++ lenya/trunk/src/webapp/lenya/content/about.xml Sun Mar 20 12:07:15 2005
@@ -20,7 +20,7 @@
<page:page
xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0">
-<page:title>Apache Lenya 1.4-dev</page:title>
+<page:title>Apache Lenya @lenya.version@</page:title>
<page:body>
<div class="lenya-box">
<p>
Modified: lenya/trunk/src/webapp/lenya/content/introduction.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/content/introduction.xml?view=diff&r1=158345&r2=158346
==============================================================================
--- lenya/trunk/src/webapp/lenya/content/introduction.xml (original)
+++ lenya/trunk/src/webapp/lenya/content/introduction.xml Sun Mar 20 12:07:15 2005
@@ -20,7 +20,7 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="lenya-frontpage">
<h2>Welcome to Apache Lenya</h2>
<p>
-You have successfully installed Apache Lenya <strong>1.4-dev</strong>. To start, click on any of the publications on the left.</p>
+You have successfully installed Apache Lenya <strong>@lenya.version@</strong>. To start, click on any of the publications on the left.</p>
<h3>About Apache Lenya</h3>
<p>
Modified: lenya/trunk/src/webapp/lenya/pubs/blog/publication.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/blog/publication.xml?view=diff&r1=158345&r2=158346
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/publication.xml (original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/publication.xml Sun Mar 20 12:07:15 2005
@@ -18,8 +18,8 @@
<!-- $Id$ -->
<lenya:publication xmlns:lenya="http://apache.org/cocoon/lenya/publication/1.0">
-<lenya:pub-version>1.0</lenya:pub-version>
-<lenya:lenya-version>1.4-dev</lenya:lenya-version>
+<lenya:pub-version>@lenya.version@</lenya:pub-version>
+<lenya:lenya-version>@lenya.version@</lenya:lenya-version>
<lenya:cocoon-version>2.1.6</lenya:cocoon-version>
<lenya:name>Lenya's Weblog</lenya:name>
<lenya:description>
Modified: lenya/trunk/src/webapp/lenya/pubs/default/publication.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/publication.xml?view=diff&r1=158345&r2=158346
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/publication.xml (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/publication.xml Sun Mar 20 12:07:15 2005
@@ -19,8 +19,8 @@
<lenya:publication xmlns:lenya="http://apache.org/cocoon/lenya/publication/1.0">
<lenya:name>Default Publication</lenya:name>
- <lenya:pub-version>1.0</lenya:pub-version>
- <lenya:lenya-version>1.4-dev</lenya:lenya-version>
+ <lenya:pub-version>@lenya.version@</lenya:pub-version>
+ <lenya:lenya-version>@lenya.version@</lenya:lenya-version>
<lenya:cocoon-version>2.1.6</lenya:cocoon-version>
<lenya:description>This publication is a best practice, getting started publication.</lenya:description>
<lenya:credits>Special thanks to </lenya:credits>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org