dleslie 00/10/25 09:19:54
Modified: . build.xml
Log:
Updated to use Ant 1.2.
Revision Changes Path
1.33 +71 -61 xml-xalan/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 2000/10/13 14:51:23 1.32
+++ build.xml 2000/10/25 16:19:53 1.33
@@ -53,7 +53,7 @@
- Much of this file stolen from Stefano's xml-xerces build.xml
- $Id: build.xml,v 1.32 2000/10/13 14:51:23 dleslie Exp $
+ $Id: build.xml,v 1.33 2000/10/25 16:19:53 dleslie Exp $
==================================================================== -->
@@ -68,7 +68,6 @@
<property name="name" value="xalan"/>
<property name="Name" value="Xalan-Java"/>
<property name="year" value="2000"/>
- <property name="xalan.jar" value="${name}.jar"/>
<property name="build.compiler" value="classic"/>
<property name="debug" value="off"/>
@@ -90,8 +89,7 @@
<property name="doc.generator.styletar"
value="${xdocs.dir}/xml-site-style.tar"/>
<property name="build.dir" value="./build"/>
- <property name="build.src" value="${build.dir}/src"/>
- <property name="build.dest" value="${build.dir}/classes"/>
+ <property name="build.classes" value="${build.dir}/classes"/>
<property name="build.docs" value="${build.dir}/docs"/>
<property name="build.samples" value="${build.dir}/samples"/>
<property name="build.apidocs" value="${build.docs}/apidocs"/>
@@ -108,8 +106,7 @@
<!-- ===================================================================
-->
<target name="prepare">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.src}"/>
- <mkdir dir="${build.dest}"/>
+ <mkdir dir="${build.classes}"/>
</target>
<target name="prepare.docs" depends="prepare">
<gunzip src="${doc.generator.styletargz}"/>
@@ -129,7 +126,7 @@
<!-- ===================================================================
-->
<target name="compile" depends="prepare">
<javac srcdir="${src.dir}"
- destdir="${build.dest}"
+ destdir="${build.classes}"
debug="${debug}" />
</target>
@@ -137,7 +134,7 @@
<!-- Creates the xalan JAR
-->
<!-- ===================================================================
-->
<target name="package" depends="compile">
- <jar jarfile="${build.dir}/${xalan.jar}" basedir="${build.dest}"/>
+ <jar jarfile="${build.dir}/xalan.jar" basedir="${build.classes}"/>
</target>
<!-- ===================================================================
-->
@@ -151,31 +148,31 @@
<!-- Since the samples are packageless, they must be compiled
separately. -->
- <javac srcdir="${samples.dir}/ApplyXPath"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <javac srcdir="${samples.dir}/ApplyXPath"
classpath="${java.class.path}:${build.dir}/xalan.jar"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
- <javac srcdir="${samples.dir}/Extensions"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <javac srcdir="${samples.dir}/Extensions"
classpath="${java.class.path}:${build.dir}/xalan.jar"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
- <javac srcdir="${samples.dir}/Pipe"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <javac srcdir="${samples.dir}/Pipe"
classpath="${java.class.path}:${build.dir}/xalan.jar"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
- <javac srcdir="${samples.dir}/SimpleTransform"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <javac srcdir="${samples.dir}/SimpleTransform"
classpath="${java.class.path}:${build.dir}/xalan.jar"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
- <javac srcdir="${samples.dir}/TransformToDom"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <javac srcdir="${samples.dir}/TransformToDom"
classpath="${java.class.path}:${build.dir}/xalan.jar"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
- <javac srcdir="${samples.dir}/PureSAX"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <javac srcdir="${samples.dir}/PureSAX"
classpath="${java.class.path}:${build.dir}/xalan.jar"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
- <javac srcdir="${samples.dir}/UseStylesheetParam"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <javac srcdir="${samples.dir}/UseStylesheetParam"
classpath="${java.class.path}:${build.dir}/xalan.jar"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
<jar jarfile="${build.samples}/${name}samples.jar"
basedir="${build.samples}"
includes="*.class"/>
<!-- Jar twice, so jar is built even if user doesn't have
classpath set up to compile the servlet -->
- <javac srcdir="${samples.dir}/Servlet"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <javac srcdir="${samples.dir}/Servlet"
classpath="${java.class.path}:${build.dir}/xalan.jar"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
<jar jarfile="${build.samples}/${name}samples.jar"
basedir="${build.samples}"
@@ -191,8 +188,9 @@
<target name="autodocs">
<echo message="autodocs is for automated build process, without
dependencies"/>
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
- args="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/xalan.jar">
+ <arg line="targetDirectory=${build.docs} ${xdocs.book}
${xdocs.style}"/>
+ </java>
</target>
<!-- ===================================================================
-->
@@ -205,15 +203,15 @@
<target name="autojavadocs">
<echo message="autojavadocs is for automated build process, without
dependencies"/>
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
- args="loaderConfig=${xdocs.javadocloader}
targetDirectory=${src.dir} ${xdocs.javadocbook} ${xdocs.style}"/>
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/xalan.jar">
+ <arg line="loaderConfig=${xdocs.javadocloader}
targetDirectory=${src.dir} ${xdocs.javadocbook} ${xdocs.style}"/>
+ </java>
<javadoc
public="true"
doclet="xalanjdoc.Standard"
sourcepath="${src.dir}"
- overview="${src.dir}/javadocOverview.html"
-
packagenames="org.apache.xalan.xpath,org.apache.xalan.xpath.xdom,org.apache.xalan.xpath.dtm,org.apache.xalan.xpath.xml,org.apache.xalan.xslt,org.apache.xalan.xslt.trace,org.apache.xalan.xslt.client,org.apache.xalan.xslt.extensions"
+ overview="${src.dir}/javadocOverview.html"
packagenames="org.apache.xalan.xpath,org.apache.xalan.xpath.xdom,org.apache.xalan.xpath.dtm,org.apache.xalan.xpath.xml,org.apache.xalan.xslt,org.apache.xalan.xslt.trace,org.apache.xalan.xslt.client,org.apache.xalan.xslt.extensions"
group="XSLT_Packages org.apache.xalan.xslt*,XPath_Packages
org.apache.xalan.xpath*"
destdir="${build.apidocs}"
author="true"
@@ -237,10 +235,14 @@
<!-- in the source tree
-->
<!-- ===================================================================
-->
<target name="clean">
- <deltree dir="${build.dir}"/>
- <deltree dir="${site.root}"/>
- <delete dir="${xdocs.style}" excludes="${xalanonly-styledocs}"/>
- <delete dir="${src.dir}"
includes="javadocOverview.html,**/package.html"/>
+ <delete dir="${build.dir}"/>
+ <delete dir="${site.root}"/>
+ <delete>
+ <fileset dir="${xdocs.style}" excludes="${xalanonly-styledocs}"/>
+ </delete>
+ <delete>
+ <fileset dir="${src.dir}"
includes="javadocOverview.html,**/package.html"/>
+ </delete>
</target>
<!-- ===================================================================
-->
@@ -259,41 +261,44 @@
<mkdir dir="${build.dist}/samples"/>
<!-- Copy over sources and source documentation -->
- <copydir src="${src.dir}" dest="${build.dist}/src"/>
- <copydir src="${xdocs.dir}" dest="${build.dist}/xdocs"/>
-
+ <copy todir="${build.dist}/src">
+ <fileset dir="${src.dir}"/>
+ </copy>
+ <copy todir="${build.dist}/xdocs">
+ <fileset dir="${xdocs.dir}"/>
+ </copy>
+
<!-- Copy over pre-built documentation and javadoc, and samples src and
jar -->
- <copydir src="${build.docs}" dest="${build.dist}/docs"/>
- <copydir src="${samples.dir}" dest="${build.dist}/samples"/>
- <copyfile src="${build.samples}/${name}samples.jar"
dest="${build.dist}/samples/${name}samples.jar"/>
+ <copy todir="${build.dist}/docs">
+ <fileset dir="${build.docs}"/>
+ </copy>
+ <copy todir="${build.dist}/samples">
+ <fileset dir="${samples.dir}"/>
+ </copy>
+ <copy file="${build.samples}/xalansamples.jar"
todir="${build.dist}/samples"/>
<!-- Copy runtime jars into old-style locations in the root -->
- <copyfile src="${build.dir}/${xalan.jar}"
dest="${build.dist}/${xalan.jar}"/>
- <copyfile src="xerces.jar" dest="${build.dist}/xerces.jar"/>
- <copyfile src="bsf.jar" dest="${build.dist}/bsf.jar"/>
- <copyfile src="bsfengines.jar" dest="${build.dist}/bsfengines.jar"/>
+ <copy todir="${build.dist}">
+ <fileset dir="${build.dir}" includes="xalan.jar,xerces.jar,bsf.jar"/>
+ </copy>
+
+ <copy todir="${build.dist}">
+ <fileset dir="."
includes="README,README.html,CREDITS,KEYS,License,build.xml,build.sh,build.bat"/>
+ </copy>
<!-- Copy Ant-related build.xml and other READMEs, etc. -->
<mkdir dir="${build.dist}/bin"/>
- <copyfile src="bin/ant.jar" dest="${build.dist}/bin/ant.jar"/>
- <copyfile src="bin/antRun" dest="${build.dist}/bin/antRun"/>
- <copyfile src="bin/antRun.bat" dest="${build.dist}/bin/antRun.bat"/>
- <copyfile src="README" dest="${build.dist}/README"/>
- <copyfile src="README.html" dest="${build.dist}/README.html"/>
- <copyfile src="CREDITS" dest="${build.dist}/CREDITS"/>
- <copyfile src="KEYS" dest="${build.dist}/KEYS"/>
- <copyfile src="License" dest="${build.dist}/License"/>
- <copyfile src="build.xml" dest="${build.dist}/build.xml"/>
- <copyfile src="build.sh" dest="${build.dist}/build.sh"/>
- <copyfile src="build.bat" dest="${build.dist}/build.bat"/>
-
+ <copy todir="${build.dist}/bin">
+ <fileset dir="{bin.dir}" includes="ant.jar,antRun,antRun.bat"/>
+ </copy>
+
<!-- Old Makefile etc. - deprecated. -->
- <copyfile src="Makefile" dest="${build.dist}/Makefile"/>
- <copyfile src="make.include" dest="${build.dist}/make.include"/>
- <copyfile src="make.include2" dest="${build.dist}/make.include2"/>
+ <copy todir="${build.dist}">
+ <fileset dir="." includes="Makefile,make.include,make.include2"/>
+ </copy>
- <zip zipfile="${build.dir}/${dist.file}.zip" basedir="${build.dist}"
includes="**"/>
- <tar tarfile="${build.dir}/${dist.file}.tar" basedir="${build.dist}"
includes="**"/>
+ <zip zipfile="${build.dir}/${dist.file}.zip" basedir="${build.dir}"
includes="${dist.file}/**"/>
+ <tar tarfile="${build.dir}/${dist.file}.tar" basedir="${build.dir}"
includes="${dist.file}/**"/>
<gzip src="${build.dir}/${dist.file}.tar"
zipfile="${build.dir}/${dist.file}.tar.gz"/>
</target>
@@ -305,17 +310,20 @@
<mkdir dir="${site.dir}"/>
<mkdir dir="${site.dir}/apidocs"/>
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
- args="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/xalan.jar">
+ <arg line="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
+ </java>
- <copydir src="${build.apidocs}" dest="${site.dir}/apidocs"/>
+ <copy todir="${site.dir}/apidocs">
+ <fileset dir="${build.apidocs}"/>
+ </copy>
</target>
<!-- ===================================================================
-->
<!-- Aliases for package and javadocs tasks
-->
<!-- ===================================================================
-->
<target name="jar" depends="package">
- <echo message="jar is an alias for the package task -- creates
${xalan.jar}..."/>
+ <echo message="jar is an alias for the package task -- creates
xalan.jar..."/>
</target>
<target name="apidocs" depends="javadocs">
@@ -326,8 +334,9 @@
<!-- For internal use only
-->
<!-- ===================================================================
-->
<target name="xalan-j2-design">
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
- args="loaderConfig=sbk:/style/loaderdesign.xml
targetDirectory=./build/site/design/ ./xdocs/sources/xalandesign.xml
./xdocs/style"/>
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/xalan.jar">
+ <arg line="loaderConfig=sbk:/style/loaderdesign.xml
targetDirectory=./build/site/design/ ./xdocs/sources/xalandesign.xml
./xdocs/style"/>
+ </java>
</target>
<target name="xalan-c-apidocs-targz">
@@ -341,9 +350,10 @@
</target>
<target name="notice-draft" depends="prepare">
- <java fork="yes" classname="org.apache.xalan.xslt.Process"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
- args="-parser org.apache.xalan.xpath.xdom.XercesLiaison -text -in
${xdocs.dir}/sources/xalan/notice.xml -xsl
+ <java fork="yes" classname="org.apache.xalan.xslt.Process"
classpath="${java.class.path}:${build.dir}/xalan.jar">
+ <arg line="-parser org.apache.xalan.xpath.xdom.XercesLiaison -text
-in ${xdocs.dir}/sources/xalan/notice.xml -xsl
xdocs/style/stylesheets/notice.xsl -out build/site/notice.txt"/>
+ </java>
</target>
</project>
