curcuru 00/08/18 14:36:43
Modified: . build.xml build.bat
Log:
Update Ant buildfiles for Ant v1.1 and for upcoming Xalan 1.2D02
Revision Changes Path
1.26 +132 -127 xml-xalan/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 2000/07/28 13:31:27 1.25
+++ build.xml 2000/08/18 21:36:42 1.26
@@ -2,25 +2,19 @@
<!-- ===================================================================
- Build file for Xalan-Java - for use with the Jakarta Ant java build tool
+ Build file for Xalan-J 1.x - for use with the Jakarta Ant java build tool
Setup instructions:
Before running an Ant build, you must
- - set the JAVA_HOME environment variable to the JDK (1.2.2 or higher)
root directory
- - in build.bat/build.sh, set the SERVLET environment variable to a jar
file containing
- the javax.servlet and javax.servlet.http packages (e.g., from Sun's
JSDWK 1.0.1).
- These packages are required to build/run the servlet in
samples/servlet
+ - set the JAVA_HOME environment variable to the JDK root directory
+ - To build samples: set the SERVLET_HOME environment variable
+ - To build docs/javadocs: use JDK 1.2.x or higher
- When the Xalan team uses this tool to build a distribution, we also need
to
- - copy the correct version (FOR THIS BUILD) of xerces.jar to the
directory in which this file is located
- - update the (Xalan-J) version property in the "init" target
Build Instructions:
To build, run
-
build.bat (win32) or build.sh (unix) - optionally with a target arg as
indicated below -
-
in the directory where this file is located.
The batch/shell file sets up your classpath and calls java
org.apache.tools.ant.Main
@@ -37,7 +31,8 @@
- clean purges the build, distribution, and site trees.
If you build a target that depends on other targets, those other targets are
created in
-the correct order.
+the correct order. As a convenience for automated builds, docs and javadocs
do
+not have dependencies on package.
Authors:
Stefano Mazzocchi <[EMAIL PROTECTED]>
@@ -56,7 +51,7 @@
- Much of this file stolen from Stefano's xml-xerces build.xml
- $Id: build.xml,v 1.25 2000/07/28 13:31:27 dleslie Exp $
+ $Id: build.xml,v 1.26 2000/08/18 21:36:42 curcuru Exp $
==================================================================== -->
@@ -65,85 +60,74 @@
<!-- ===================================================================
-->
<!-- Defines variables used by the other targets
-->
<!-- ===================================================================
-->
-
- <target name="init">
- <property name="version" value="1_2_D01"/>
- <property name="xerces.bin.dir" value="/xerces-1_1_2"/>
-
- <property name="name" value="xalan"/>
- <property name="Name" value="Xalan-Java"/>
- <property name="year" value="2000"/>
-
- <property name="build.compiler" value="classic"/>
- <property name="debug" value="off"/>
-
- <property name="src.dir" value="./src"/>
- <property name="xdocs.dir" value="./xdocs"/>
- <property name="samples.dir" value="./samples"/>
- <property name="version.file"
value="org/apache/xalan/xslt/XSLProcessorVersion.java"/>
- <property name="packages" value="org.*"/><!-- Check that this correctly
gets all needed javadoc 17-Jan-00 SCurcuru -->
-
- <property name="xdocs.book" value="${xdocs.dir}/sources/xalanlocal.xml"/>
- <property name="xdocs.style" value="${xdocs.dir}/style"/>
- <property name="xdocs.javadocbook"
value="${xdocs.dir}/sources/javadocPackages.xml"/>
- <property name="xdocs.javadocloader" value="sbk:/style/loaderjdoc.xml"/>
- <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
- <property name="doc.generator.styletargz"
value="${xdocs.dir}/xml-site-style.tar.gz"/>
- <property name="doc.generator.styletar"
value="${xdocs.dir}/xml-site-style.tar"/>
-
- <property name="build.dir" value="./build"/>
- <property name="build.src" value="./build/src"/>
- <property name="build.dest" value="./build/classes"/>
- <property name="build.docs" value="./build/docs"/>
- <property name="build.samples" value="./build/samples"/>
- <property name="build.apidocs" value="./build/docs/apidocs"/>
-
- <property name="dist.file" value="${name}-j_${version}"/>
- <property name="dist.dir" value="./${dist.file}"/> <!-- Check dir
name dash/underscore 17-Jan-00 SCurcuru -->
-
- <property name="site.root" value="./xml-site"/>
- <property name="site.dir" value="./xml-site/target/xalan"/>
- <property name="site.book" value="${xdocs.dir}/sources/xalan.xml"/>
- </target>
+ <property name="version" value="1_2_D02"/>
+ <property name="xerces.bin.dir" value="/xerces-1_1_3"/>
+
+ <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"/>
+
+ <property name="src.dir" value="./src"/>
+ <property name="samples.dir" value="./samples"/>
+ <property name="version.file"
value="org/apache/xalan/xslt/XSLProcessorVersion.java"/>
+ <property name="packages" value="org.*"/><!-- Check that this correctly
gets all needed javadoc 17-Jan-00 SCurcuru -->
+
+ <property name="xdocs.dir" value="./xdocs"/>
+ <property name="xdocs.book" value="${xdocs.dir}/sources/xalanlocal.xml"/>
+ <property name="xdocs.style" value="${xdocs.dir}/style"/>
+ <property name="xdocs.javadocbook"
value="${xdocs.dir}/sources/javadocPackages.xml"/>
+ <property name="xdocs.javadocloader" value="sbk:/style/loaderjdoc.xml"/>
+ <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
+ <property name="doc.generator.styletargz"
value="${xdocs.dir}/xml-site-style.tar.gz"/>
+ <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.docs" value="${build.dir}/docs"/>
+ <property name="build.samples" value="${build.dir}/samples"/>
+ <property name="build.apidocs" value="${build.dir}/docs/apidocs"/>
+
+ <property name="dist.file" value="${name}-j_${version}"/>
+ <property name="build.dist" value="${build.dir}/${dist.file}"/>
+
+ <property name="site.root" value="./xml-site"/>
+ <property name="site.dir" value="./xml-site/target/xalan"/>
+ <property name="site.book" value="${xdocs.dir}/sources/xalan.xml"/>
<!-- ===================================================================
-->
- <!-- Prepares the xdocs/style and the build directories
-->
+ <!-- Prepares the build directories
-->
<!-- ===================================================================
-->
- <target name="prepare" depends="init">
- <gunzip src="${doc.generator.styletargz}"/>
- <untar src="${doc.generator.styletar}" dest="${xdocs.dir}"/>
+ <target name="prepare">
<mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.src}"/>
+ <mkdir dir="${build.dest}"/>
</target>
<!-- ===================================================================
-->
<!-- Copy over the source code
-->
+ <!-- We're currently skipping this step, since it seems extraneous if
+ you're not going to be using the filtering stuff. -->
<!-- ===================================================================
-->
- <target name="prepare-src" depends="prepare">
- <!-- create directories -->
- <mkdir dir="${build.src}"/>
- <mkdir dir="${build.dest}"/>
-
- <!-- copy src files -->
- <copydir src="${src.dir}" dest="${build.src}"/>
- <echo message="FIXME: Updating the version number"/>
- <!-- <replace file="${build.src}/${version.file}" token="@@version@@"
value="${version}"/> -->
- <!-- <replace file="${build.src}/${version.file}" token="@@year@@"
value="${year}"/> -->
- </target>
-
-
<!-- ===================================================================
-->
<!-- Compiles the source tree
-->
<!-- ===================================================================
-->
- <target name="compile" depends="prepare-src">
- <javac srcdir="${build.src}" destdir="${build.dest}" debug="${debug}"/>
+ <target name="compile" depends="prepare">
+ <javac srcdir="${src.dir}"
+ destdir="${build.dest}"
+ debug="${debug}" />
</target>
<!-- ===================================================================
-->
<!-- Creates the xalan JAR
-->
<!-- ===================================================================
-->
<target name="package" depends="compile">
- <jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}"/>
+ <jar jarfile="${build.dir}/${xalan.jar}" basedir="${build.dest}"/>
</target>
<!-- ===================================================================
-->
@@ -157,30 +141,34 @@
<!-- Since the samples are packageless, they must be compiled
separately. -->
- <javac srcdir="${samples.dir}/ApplyXPath"
classpath="${java.class.path}:${build.dir}/${name}.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}/${name}.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}/${name}.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}/${name}.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}/${name}.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}/${name}.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}/${name}.jar"
+ <javac srcdir="${samples.dir}/UseStylesheetParam"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
- <javac srcdir="${samples.dir}/Servlet"
classpath="${java.class.path}:${build.dir}/${name}.jar"
+ <!-- The Servlet sample has already been updated to Xalan 2.x, so we
can't
+ actually compile it here -->
+ <!--
+ javac srcdir="${samples.dir}/Servlet"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
destdir="${build.samples}" excludes="${exclude}"
- debug="${debug}"/>
+ debug="${debug}"/
+ -->
<jar jarfile="${build.samples}/${name}samples.jar"
basedir="${build.samples}"
includes="*.class"/>
</target>
@@ -188,18 +176,20 @@
<!-- ===================================================================
-->
<!-- Generate HTML docs
-->
<!-- ===================================================================
-->
- <target name="docs" depends="package"> <!-- xalan.jar used by
doc.generator -->
+ <!-- explicitly remove depends=package to make automated JDK 1.1.8 builds
easier -->
+ <target name="docs" depends="prepare"> <!-- xalan.jar used by
doc.generator -->
<mkdir dir="${build.docs}"/>
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${name}.jar"
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
args="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
</target>
<!-- ===================================================================
-->
<!-- Creates the API documentation
-->
<!-- ===================================================================
-->
- <target name="javadocs" depends="package"> <!-- xalan.jar used by
doc.generator -->
+ <!-- explicitly remove depends=package to make automated JDK 1.1.8 builds
easier -->
+ <target name="javadocs" depends="prepare"> <!-- xalan.jar used by
doc.generator -->
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${name}.jar"
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
args="loaderConfig=${xdocs.javadocloader}
targetDirectory=${build.src} ${xdocs.javadocbook} ${xdocs.style}"/>
<mkdir dir="${build.apidocs}"/>
@@ -207,7 +197,8 @@
public="true"
doclet="xalanjdoc.Standard"
sourcepath="${build.src}"
- overview="${build.src}/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="${build.src}/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"
@@ -222,49 +213,63 @@
<!-- ===================================================================
-->
<!-- Cleans everything
-->
<!-- ===================================================================
-->
- <target name="clean" depends="init">
+ <target name="clean">
<deltree dir="${build.dir}"/>
- <deltree dir="${dist.dir}"/>
<deltree dir="${site.root}"/>
</target>
<!-- ===================================================================
-->
<!-- Creates the distribution
-->
<!-- ===================================================================
-->
- <target name="dist" depends="docs,javadocs,samples">
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${dist.dir}/src"/>
- <mkdir dir="${dist.dir}/xdocs"/>
- <mkdir dir="${dist.dir}/docs"/>
- <mkdir dir="${dist.dir}/docs/javadocs"/>
- <mkdir dir="${dist.dir}/samples"/>
-
- <copydir src="${build.src}" dest="${dist.dir}/src"/>
- <copydir src="${xdocs.dir}" dest="${dist.dir}/xdocs"/>
- <copydir src="${build.docs}" dest="${dist.dir}/docs"/>
-
- <copydir src="${samples.dir}" dest="${dist.dir}/samples"/>
- <copyfile src="${build.samples}/${${name}samples.jar"
dest="${dist.dir}/samples/${name}samples.jar"/>
-
- <copyfile src="${build.dir}/${name}.jar" dest="${dist.dir}/${name}.jar"/>
- <copyfile src="xerces.jar" dest="${dist.dir}/xerces.jar"/>
- <copyfile src="bsf.jar" dest="${dist.dir}/bsf.jar"/>
- <copyfile src="bsfengines.jar" dest="${dist.dir}/bsfengines.jar"/>
- <copyfile src="xml.jar" dest="${dist.dir}/xml.jar"/>
- <copyfile src="ant.jar" dest="${dist.dir}/ant.jar"/>
- <copyfile src="README" dest="${dist.dir}/README"/>
- <copyfile src="README.html" dest="${dist.dir}/README.html"/>
- <copyfile src="CREDITS" dest="${dist.dir}/CREDITS"/>
- <copyfile src="KEYS" dest="${dist.dir}/KEYS"/>
- <copyfile src="License" dest="${dist.dir}/License"/>
- <copyfile src="build.xml" dest="${dist.dir}/build.xml"/>
- <copyfile src="Makefile" dest="${dist.dir}/Makefile"/>
- <copyfile src="make.include" dest="${dist.dir}/make.include"/>
- <copyfile src="make.include2" dest="${dist.dir}/make.include2"/>
+ <target name="dist" depends="package,docs,javadocs,samples,autodist">
+ <echo message="dist is human-useable target for distribution, with all
dependencies"/>
+ </target>
+ <target name="autodist">
+ <echo message="autodist is for automated build processes, without
dependencies"/>
+ <mkdir dir="${build.dist}"/>
+ <mkdir dir="${build.dist}/src"/>
+ <mkdir dir="${build.dist}/xdocs"/>
+ <mkdir dir="${build.dist}/docs"/>
+ <mkdir dir="${build.dist}/docs/javadocs"/>
+ <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 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 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 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"/>
+
+ <!-- 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"/>
- <zip zipfile="${dist.file}.zip" basedir="${dist.dir}" includes="*"/>
- <tar tarfile="${dist.file}.tar" basedir="${dist.dir}" includes="*"/>
- <gzip src="${dist.file}.tar" zipfile="${dist.file}.tar.gz"/>
+ <zip zipfile="${build.dir}/${dist.file}.zip" basedir="${build.dist}"
includes="**"/>
+ <tar tarfile="${build.dir}/${dist.file}.tar" basedir="${build.dist}"
includes="**"/>
+ <gzip src="${build.dir}/${dist.file}.tar"
zipfile="${build.dir}/${dist.file}.tar.gz"/>
</target>
<!-- ===================================================================
-->
@@ -275,7 +280,7 @@
<mkdir dir="${site.dir}"/>
<mkdir dir="${site.dir}/apidocs"/>
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${name}.jar"
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
args="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
<copydir src="${build.docs}/resources"
dest="${site.dir}/docs/resources"/>
@@ -286,18 +291,18 @@
<!-- Aliases for package and javadocs tasks
-->
<!-- ===================================================================
-->
<target name="jar" depends="package">
- <echo message="jar is an alias for the package task -- creates
${name}.jar..."/>
+ <echo message="jar is an alias for the package task -- creates
${xalan.jar}..."/>
</target>
<target name="apidocs" depends="javadocs">
- <echo message="apidocs is an alias for the javadocs task -- creates
Javadoc..."/>
+ <echo message="apidocs is an alias for the javadocs task -- creates
Javadoc..."/>
</target>
<!-- ===================================================================
-->
<!-- For internal use only
-->
<!-- ===================================================================
-->
<target name="xalan-j2-design">
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${name}.jar"
+ <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"/>
</target>
@@ -311,8 +316,8 @@
<gzip src="build/holding/xml-site-style.tar"
zipfile="build/holding/xml-site-style.tar.gz"/>
</target>
- <target name="notice-draft" depends="prepare-src">
- <java fork="yes" classname="org.apache.xalan.xslt.Process"
classpath="${java.class.path}:${build.dir}/${name}.jar"
+ <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
xdocs/style/stylesheets/notice.xsl -out build/site/notice.txt"/>
</target>
1.9 +27 -23 xml-xalan/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/build.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.bat 2000/06/28 19:28:52 1.8
+++ build.bat 2000/08/18 21:36:42 1.9
@@ -1,36 +1,42 @@
@echo off
-
+rem Prerequisites: user must set JAVA_HOME
if "%JAVA_HOME%" == "" goto error
-
echo.
-echo Xalan-J Build
+echo Xalan-J 1.x Build
echo -------------
-rem Update SERVLET to point to JAR containing javax.servlet and
javax.servlet.http packages.
-set SERVLET=\jswdk-1.0.1\lib\servlet.jar
+rem Default ANT_HOME if not set
+set SAVEANTHOME=%ANT_HOME%
+if "%ANT_HOME%" == "" set ANT_HOME=.
+
+rem Update SERVLET_HOME to point to JAR containing javax.servlet and
javax.servlet.http packages.
+rem This may be needed to compile samples
+if "%SERVLET_HOME%" == "" set SERVLET_HOME=\jsdk2.0
+set SERVLET_JAR=%SERVLET_HOME%\lib\servlet.jar
+
+rem This automatically adds system classes to CLASSPATH
+set SAVECP=%CLASSPATH%
+if exist %JAVA_HOME%\lib\tools.jar set
CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
+if exist %JAVA_HOME%\lib\classes.zip set
CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\classes.zip
-set ANT=ant.jar
-set JAVAC=%JAVA_HOME%\lib\tools.jar
+rem Default locations of jars we depend on
+set ANT=bin\ant.jar
set XERCES=xerces.jar
set BSF=bsf.jar
set BSFENGINES=bsfengines.jar
set DOCGENERATOR=xdocs\stylebook-1.0-b2.jar
set DOCLET=xdocs\xalanjdoc.jar
-set HOLDINGPATH=%CLASSPATH%
-
rem DOCLET must be on system CLASSPATH for javadocs task to work. Just
including it in
rem -classpath arg for java or javadoc call doesn't work....
-
-set
CLASSPATH=%ANT%;%JAVAC%;%XERCES%;%BSF%;%BSFENGINES%;%SERVLET%;%DOCGENERATOR%;%DOCLET%;%CLASSPATH%
-
+set
CLASSPATH=%ANT%;%XERCES%;%BSF%;%BSFENGINES%;%SERVLET_JAR%;%DOCGENERATOR%;%DOCLET%;%CLASSPATH%
echo.
echo Building with classpath %CLASSPATH%
-
-echo.
echo Starting Ant...
-%JAVA_HOME%\bin\java.exe -Dant.home="%ANT_HOME%" -classpath "%CLASSPATH%"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
+rem Temporarily, up the -mx memory since we compile a really big glob of
files
+echo %JAVA_HOME%\bin\java -mx32m -Dant.home="%ANT_HOME%" -classpath
"%CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+%JAVA_HOME%\bin\java -mx32m -Dant.home="%ANT_HOME%" -classpath "%CLASSPATH%"
org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
goto end
@@ -42,16 +48,14 @@
echo "root directory of the Java Virtual Machine you want to use."
:end
-
-set CLASSPATH=%HOLDINGPATH%
-set HOLDINGPATH=
+rem Cleanup environment variables
+set CLASSPATH=%SAVECP%
+set SAVECP=
+set ANT_HOME=%SAVEANTHOME%
+set SAVEANTHOME=
+set SERVLET_JAR=
set XERCES=
set BSF=
set BSFENGINES=
-set SERVLET=
-set DOCGENERATOR=
set DOCLET=
set ANT=
-set XML=
-set ANT_HOME=
-set JAVAC=
\ No newline at end of file
