[jboss-cvs] JBossAS SVN: r59928 - trunk/docbook-support.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 22 16:49:31 EST 2007
Author: manik.surtani at jboss.com
Date: 2007-01-22 16:49:31 -0500 (Mon, 22 Jan 2007)
New Revision: 59928
Modified:
trunk/docbook-support/support.xml
Log:
Updated support.xml to be able to deal with an overridden basedir if passed in
Modified: trunk/docbook-support/support.xml
===================================================================
--- trunk/docbook-support/support.xml 2007-01-22 21:14:28 UTC (rev 59927)
+++ trunk/docbook-support/support.xml 2007-01-22 21:49:31 UTC (rev 59928)
@@ -3,7 +3,7 @@
<dirname property="support.basedir" file="${ant.file.DocSupport}"/>
<!-- Set build directories for all formats. -->
- <property name="build.dir" value="${basedir}/build"/>
+ <property name="build.dir" value="build"/>
<!-- Support files for build process. -->
<property name="support.dir" value="${support.basedir}/support"/>
@@ -37,7 +37,7 @@
<!-- ################################################################## -->
<target name="lang.all.bypass.check" unless="lang.all.bypass.disabled">
- <uptodate property="lang.all.bypass.on" targetfile="${build.dir}/${lang}/pdf/${pdf.name}">
+ <uptodate property="lang.all.bypass.on" targetfile="${basedir}/${build.dir}/${lang}/pdf/${pdf.name}">
<srcfiles dir="${support.basedir}" includes="**"/>
<srcfiles dir="${basedir}/${lang}" includes="**"/>
<srcfiles dir="${basedir}" includes="build.xml"/>
@@ -50,14 +50,14 @@
</target>
<target name="lang.all.bypass.message" if="lang.all.bypass.on">
- <echo>Already uptodate: ${build.dir}/${lang}/pdf/${pdf.name}</echo>
+ <echo>Already uptodate: ${basedir}/${build.dir}/${lang}/pdf/${pdf.name}</echo>
<echo>add -Dlang.all.bypass.disabled=true to force a rebuild</echo>
</target>
<!-- ################################################################## -->
<target name="lang.dochtml.bypass.check" unless="lang.dochtml.bypass.disabled">
- <uptodate property="lang.dochtml.bypass.on" targetfile="${build.dir}/${lang}/html/index.html">
+ <uptodate property="lang.dochtml.bypass.on" targetfile="${basedir}/${build.dir}/${lang}/html/index.html">
<srcfiles dir="${support.basedir}" includes="**"/>
<srcfiles dir="${basedir}/${lang}" includes="**"/>
<srcfiles dir="${basedir}" includes="build.xml"/>
@@ -71,7 +71,7 @@
</target>
<target name="lang.dochtml.bypass.message" if="lang.dochtml.bypass.on">
- <echo>Already uptodate: ${build.dir}/${lang}/html/index.html</echo>
+ <echo>Already uptodate: ${basedir}/${build.dir}/${lang}/html/index.html</echo>
<echo>add -Dlang.dochtml.bypass.disabled=true to force a rebuild</echo>
</target>
@@ -79,13 +79,13 @@
<target name="clean">
<!-- Delete build directory. -->
- <delete dir="${build.dir}"/>
+ <delete dir="${basedir}/${build.dir}"/>
</target>
<target name="clean.dochtml">
<!-- Delete build directory for single html -->
- <delete dir="${build.dir}/${lang}/html"/>
- <delete dir="${build.dir}/${lang}/html_single"/>
+ <delete dir="${basedir}/${build.dir}/${lang}/html"/>
+ <delete dir="${basedir}/${build.dir}/${lang}/html_single"/>
</target>
<!-- ################################################################## -->
@@ -100,9 +100,11 @@
</target>
<target name="lang.docpdf">
- <!-- Copy all the images to the output location,
+ <!-- Copy all the images to the output location,
will be removed later. -->
- <copy todir="${build.dir}/${lang}/pdf/images">
+
+ <!-- "rebuild" the build.dir variable, in case ${basedir} has been overridden -->
+ <copy todir="${basedir}/${build.dir}/${lang}/pdf/images">
<fileset dir="${basedir}/${lang}/images">
<include name="**/*.png"/>
<include name="**/*.svg"/>
@@ -118,14 +120,14 @@
fork="true" dir="${basedir}">
<classpath refid="lib.classpath"/>
<arg value="-o" />
- <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
+ <arg value="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
<arg value="${basedir}/${lang}/master.xml"/>
<arg value="${styles.dir}/${lang}/${db.style.fopdf}"/>
</java>
<!--
- <xslt out="${build.dir}/${lang}/pdf/docbook_fop.tmp"
+ <xslt out="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"
in="${basedir}/${lang}/master.xml"
style="${styles.dir}/${lang}/${db.style.fopdf}">
<xmlcatalog refid="docbook.catalog"/>
@@ -136,34 +138,34 @@
maxmemory="${maxmem}"
fork="true" dir="${basedir}">
<classpath refid="lib.classpath"/>
- <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${build.dir}/${lang}/pdf/${pdf.name}"/>
+ <arg value="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
+ <arg value="${basedir}/${build.dir}/${lang}/pdf/${pdf.name}"/>
</java>
<!-- Delete temporary files. -->
- <delete file="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
- <delete dir="${build.dir}/${lang}/pdf/images"/>
+ <delete file="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
+ <delete dir="${basedir}/${build.dir}/${lang}/pdf/images"/>
</target>
<target name="lang.dochtml">
- <mkdir dir="${build.dir}/${lang}/html/"/>
+ <mkdir dir="${basedir}/${build.dir}/${lang}/html/"/>
<!-- Copy all the images to the output location -->
- <copy todir="${build.dir}/${lang}/html/images">
+ <copy todir="${basedir}/${build.dir}/${lang}/html/images">
<fileset dir="${basedir}/${lang}/images">
<include name="**/*.png"/>
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
</fileset>
</copy>
- <copy todir="${build.dir}/${lang}/html/css">
+ <copy todir="${basedir}/${build.dir}/${lang}/html/css">
<fileset dir="${styles.dir}/${lang}">
<include name="**/*.css"/>
</fileset>
</copy>
<java classname="com.icl.saxon.StyleSheet"
- fork="true" dir="${build.dir}/${lang}/html">
+ fork="true" dir="${basedir}/${build.dir}/${lang}/html">
<classpath refid="lib.classpath"/>
<arg value="${basedir}/${lang}/master.xml"/>
<arg value="${styles.dir}/${lang}/${db.style.html}"/>
@@ -171,17 +173,17 @@
</target>
<target name="lang.dochtmlsingle">
- <mkdir dir="${build.dir}/${lang}/html_single/"/>
+ <mkdir dir="${basedir}/${build.dir}/${lang}/html_single/"/>
<!-- Copy all the images to the output location -->
- <copy todir="${build.dir}/${lang}/html_single/images">
+ <copy todir="${basedir}/${build.dir}/${lang}/html_single/images">
<fileset dir="${basedir}/${lang}/images">
<include name="**/*.png"/>
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
</fileset>
</copy>
- <copy todir="${build.dir}/${lang}/html_single/css">
+ <copy todir="${basedir}/${build.dir}/${lang}/html_single/css">
<fileset dir="${styles.dir}/${lang}">
<include name="**/*.css"/>
</fileset>
@@ -191,7 +193,7 @@
fork="true" dir="${basedir}">
<classpath refid="lib.classpath"/>
<arg value="-o"/>
- <arg value="${build.dir}/${lang}/html_single/index.html"/>
+ <arg value="${basedir}/${build.dir}/${lang}/html_single/index.html"/>
<arg value="${basedir}/${lang}/master.xml"/>
<arg value="${styles.dir}/${lang}/${db.style.htmlsingle}"/>
</java>
@@ -201,14 +203,14 @@
So, I am not using this task ... -->
<target name="lang.htmlmisc">
<!-- Copy images and CSS for HTML documentation, language specific. -->
- <copy todir="${build.dir}/${lang}/shared/images">
+ <copy todir="${basedir}/${build.dir}/${lang}/shared/images">
<fileset dir="${basedir}/${lang}/images">
<include name="**/*.png"/>
<include name="**/*.gif"/>
</fileset>
</copy>
- <copy todir="${build.dir}/${lang}/shared/css">
+ <copy todir="${basedir}/${build.dir}/${lang}/shared/css">
<fileset dir="${styles.dir}/${lang}">
<include name="**/*.css"/>
</fileset>
More information about the jboss-cvs-commits
mailing list