You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@jakarta.apache.org by se...@apache.org on 2005/04/04 04:30:41 UTC
svn commit: r159978 - jakarta/site/build.xml
Author: sebb
Date: Sun Apr 3 19:30:40 2005
New Revision: 159978
URL: http://svn.apache.org/viewcvs?view=rev&rev=159978
Log:
Pass absolute locations into download xsl files,
so no longer need the jdk14 hacks to move the files
Modified:
jakarta/site/build.xml
Modified: jakarta/site/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/site/build.xml?view=diff&r1=159977&r2=159978
==============================================================================
--- jakarta/site/build.xml (original)
+++ jakarta/site/build.xml Sun Apr 3 19:30:40 2005
@@ -7,10 +7,10 @@
<property name="target.dir" location="target"/>
<property name="docs.downloads.src" location="${docs.src}/downloads"/>
- <!-- This docs.downloads.dest value is hard-coded into xdocs/downloads/downloads-cgi.xsl -->
+ <!-- This docs.downloads.dest value is passed into xdocs/downloads/downloads-cgi.xsl -->
<property name="docs.downloads.dest" location="${docs.dest}/site/downloads"/>
- <!-- This docs.downloads.tmp value is hard-coded twice into xdocs/downloads/download-pages.xsl -->
+ <!-- This docs.downloads.tmp value is passed into xdocs/downloads/download-pages.xsl -->
<property name="docs.downloads.tmp" location="${target.dir}/download-xdocs"/>
<condition property="jdk14" value="1.4">
@@ -108,13 +108,12 @@
<xslt in="${docs.downloads.src}/downloads.xml"
out="${docs.downloads.tmp}/empty.xml"
- style="${docs.downloads.src}/download-pages.xsl"/>
+ style="${docs.downloads.src}/download-pages.xsl">
+ <param name="docs.downloads.tmp" expression="${docs.downloads.tmp}"/>
+ </xslt>
<delete file="${docs.downloads.tmp}/empty.xml"/>
- <!-- JDK 1.4 hack -->
- <antcall target="jdk14-hack-xml"/>
-
- <echo>*** Convert download xdocs to download pages</echo>
+ <echo>*** Convert download xdocs to download pages</echo>
<style basedir="${docs.downloads.tmp}"
destdir="${docs.downloads.dest}"
extension=".html"
@@ -126,12 +125,13 @@
<!-- create .cgi files -->
<echo>*** Create download .cgi file</echo>
- <xslt in="${docs.downloads.src}/downloads.xml" out="${docs.downloads.dest}/empty.xml" style="${docs.downloads.src}/downloads-cgi.xsl" />
+ <xslt in="${docs.downloads.src}/downloads.xml"
+ out="${docs.downloads.dest}/empty.xml"
+ style="${docs.downloads.src}/downloads-cgi.xsl">
+ <param name="docs.downloads.dest" expression="${docs.downloads.dest}"/>
+ </xslt>
<delete file="${docs.downloads.dest}/empty.xml"/>
- <!-- JDK 1.4 hack -->
- <antcall target="jdk14-hack-cgi"/>
-
<echo>*** Copying static resource files</echo>
<copy todir="${docs.dest}/images" filtering="no">
<fileset dir="${docs.src}/images">
@@ -150,32 +150,9 @@
</target>
- <target name="jdk14-hack-xml" if="jdk14">
- <move todir="${docs.downloads.tmp}">
- <fileset dir="${docs.downloads.tmp}/target/download-xdocs">
- <include name="**/*.xml"/>
- </fileset>
- </move>
- <delete dir="${docs.downloads.tmp}/target"/>
- </target>
-
- <target name="jdk14-hack-cgi" if="jdk14">
- <!-- Xalan-J seems to process files relative ro
- docs.downloads.dest while XSLTC creates output relative to basedir
- -->
- <property name="jdk14hack.output" value="docs/site/downloads"/>
- <property name="jdk14hack.output.toplevel" value="docs"/>
- <move todir="${docs.downloads.dest}">
- <fileset dir="${docs.downloads.dest}/${jdk14hack.output}">
- <include name="**/*.cgi"/>
- </fileset>
- </move>
- <delete dir="${docs.downloads.dest}/${jdk14hack.output.toplevel}"/>
- </target>
-
<target name="jdk14-warning" if="jdk14">
<echo>==== IT IS HIGHLY RECOMMENDED THAT YOU BUILD WITH JDK 1.5 ====</echo>
- <echo>Building with 1.4 requires magic that hopefully with work, and will change the style of the html, leading to large SVN diffs. </echo>
+ <echo>Building with 1.4 requires magic that hopefully will work, and will change the style of the html, leading to large SVN diffs. </echo>
<sleep seconds="5"/>
<echo>Continuing anyway...</echo>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: site-cvs-help@jakarta.apache.org