dleslie 00/06/16 07:02:46
Modified: . build.bat build.sh build.xml
Log:
Refined classpath settings.
Revision Changes Path
1.5 +8 -5 xml-xalan/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/build.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.bat 2000/06/15 17:57:04 1.4
+++ build.bat 2000/06/16 14:02:45 1.5
@@ -15,11 +15,14 @@
set XERCES=xerces.jar
set BSF=bsf.jar
set BSFENGINES=bsfengines.jar
-set XALAN=build\xalan.jar
set DOCGENERATOR=xdocs\stylebook-1.0-b2.jar
set DOCLET=xdocs\xalanjdoc.jar
-set HOLDPATH=%CLASSPATH%
+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%;%XML%;%BSF%;%BSFENGINES%;%SERVLET%;%DOCGENERATOR%;%DOCLET%;%CLASSPATH%
echo.
@@ -28,7 +31,7 @@
echo.
echo Starting Ant...
-%JAVA_HOME%\bin\java.exe -Dant.home="%ANT_HOME%" org.apache.tools.ant.Main
%1 %2 %3 %4 %5
+%JAVA_HOME%\bin\java.exe -Dant.home="%ANT_HOME%" -classpath "%CLASSPATH%"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
goto end
@@ -41,8 +44,8 @@
:end
-set CLASSPATH=%HOLDPATH%
-set HOLDPATH=
+set CLASSPATH=%HOLDINGPATH%
+set HOLDINGPATH=
set JAXP=
set XERCES=
set XALAN=
1.5 +2 -4 xml-xalan/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xalan/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.sh 2000/06/15 17:57:04 1.4
+++ build.sh 2000/06/16 14:02:45 1.5
@@ -21,16 +21,14 @@
XERCES=xerces.jar
BSF=bsf.jar
BSFENGINES=bsfengines.jar
-XALAN=build/xalan.jar
DOCGENERATOR=xdocs/stylebook-1.0-b2.jar
DOCLET=xdocs/xalanjdoc.jar
-LOCALCLASSPATH=$ANT:$JAVAC:$XML:$XERCES:$BSF:BSFENGINES:$XALAN:$DOCGENERATOR:$DOCLET:$CLASSPATH
+rem Make sure this classpath scheme works. I.e., can javadoc find
xalanjdoc.Standard?
+LOCALCLASSPATH=$ANT:$JAVAC:$XML:$XERCES:$BSF:BSFENGINES:$DOCGENERATOR:$DOCLET:$CLASSPATH
echo
echo Building with classpath $LOCALCLASSPATH
-
-chmod 0755 $ANT_HOME/bin/antRun
echo
echo Starting Ant...
1.17 +50 -44 xml-xalan/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2000/06/15 17:57:04 1.16
+++ build.xml 2000/06/16 14:02:45 1.17
@@ -2,15 +2,11 @@
<!-- ===================================================================
- Build file for Xalan - for use with the Jakarta Ant java build tool
+ Build file for Xalan-Java - for use with the Jakarta Ant java build tool
-Installation Instructions:
- To install Ant on your system, you need to download jakarta-ant from
- jakarta.apache.org/builds/tomcat/release/v3.1/src/ or check out the
- jakarta-ant module from the xml.apache.org CVS repository.
+Setup instructions:
+ Before running an Ant build, you must
- Then you should
-
- 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).
@@ -23,7 +19,7 @@
Build Instructions:
To build, run
- build.bat (win32) or build.sh (linux) - optionally with a target arg as
indicated below -
+ build.bat (win32) or build.sh (unix) - optionally with a target arg as
indicated below -
in the directory where this file is located.
@@ -32,14 +28,15 @@
Build targets
This build file supports the following targets:
- compile compiles Xalan-J in ./build/classes.
- - package creates ./build/xalan.jar [the default]
+ - package [or jar] creates ./build/xalan.jar [the default]
+ - samples compiles and jars the sample apps
- docs creates the html User's Guide in ./build/docs
- - javadocs generates the API documentation in ./build/docs/apidocs
+ - javadocs [or apidocs] generates the API documentation in
./build/docs/apidocs
- dist creates a complete distribution in ./xalan-j_x_x_x
- site creates the site documentation tree in ./xml-site/target/xalan
- - clean purges the build and distribution trees.
+ - clean purges the build, distribution, and site trees.
-If you build a target that requires other targets, those other targets are
created in
+If you build a target that depends on other targets, those other targets are
created in
the correct order.
Authors:
@@ -49,26 +46,23 @@
Don Leslie <[email protected]>
Fixme:
- - patch jakarta-ant to support use of javadoc -group option
- use token evaluation to keep versining info in this file only - nearly
ready
- - Much of this file stolen from Stefano's xml-xerces build.xml
Copyright:
Copyright (c) 1999-2000 The Apache Software Foundation.
+
+ - Much of this file stolen from Stefano's xml-xerces build.xml
-<<<<<<< build.xml
- $Id: build.xml,v 1.16 2000/06/15 17:57:04 dleslie Exp $
-=======
- $Id: build.xml,v 1.16 2000/06/15 17:57:04 dleslie Exp $
->>>>>>> 1.10
+ $Id: build.xml,v 1.17 2000/06/16 14:02:45 dleslie Exp $
==================================================================== -->
<project name="Xalan" default="package" basedir=".">
+
+ <!-- ===================================================================
-->
+ <!-- Defines variables used by the other targets
-->
+ <!-- ===================================================================
-->
-<!-- You must set up your classpath ahead of time! -->
-<!-- It must include xerces.jar, bsf.jar, bsfengines.jar, and (to compile
samples/servlet) servlet.jar -->
-<!-- ====== You should not need to touch anything below here ====== -->
<target name="init">
<property name="version" value="1_1_0"/>
<property name="xerces.bin.dir" value="/xerces-1_1_1"/>
@@ -104,12 +98,13 @@
<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="build.site" value="./build/site"/>
+ <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>
<!-- ===================================================================
-->
- <!-- Prepares the xdocs/style and the build directories
-->
+ <!-- Prepares the xdocs/style and the build directories
-->
<!-- ===================================================================
-->
<target name="prepare" depends="init">
<gunzip src="${doc.generator.style}"/>
@@ -135,22 +130,23 @@
<!-- ===================================================================
-->
- <!-- Compiles the source directory
-->
- <!-- You must have already set your classpath appropriately! -->
+ <!-- Compiles the source tree
-->
<!-- ===================================================================
-->
<target name="compile" depends="prepare-src">
<javac srcdir="${build.src}" destdir="${build.dest}" debug="${debug}"/>
</target>
<!-- ===================================================================
-->
- <!-- Creates the class package
-->
+ <!-- Creates the xalan JAR
-->
<!-- ===================================================================
-->
<target name="package" depends="compile">
<jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}"/>
</target>
<!-- ===================================================================
-->
- <!-- Compiles the samples
-->
+ <!-- Compiles the samples and jars the class files
-->
+ <!-- To compile (and run) the servlet sample, the javax.servlet and
-->
+ <!-- javax.servlet.http packages must be on the classpath
-->
<!-- ===================================================================
-->
<target name="samples" depends="package">
<property name="exclude" value="*.xml,*.xsl,*.txt,*.html.*.properties"/>
@@ -175,7 +171,7 @@
debug="${debug}"/>
<javac srcdir="${samples.dir}/PureSAX"
destdir="${build.samples}" excludes="${exclude}"
- debug="${debug}"/>
+ debug="${debug}"/> -->
<javac srcdir="${samples.dir}/UseStylesheetParam"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
@@ -189,20 +185,18 @@
<!-- ===================================================================
-->
<!-- Generate HTML docs
-->
<!-- ===================================================================
-->
- <target name="docs" depends="prepare">
+ <target name="docs" depends="package"> <!-- xalan.jar used by
doc.generator -->
<mkdir dir="${build.docs}"/>
- <java fork="yes" classname="${doc.generator}"
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${name}.jar"
args="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
</target>
<!-- ===================================================================
-->
<!-- Creates the API documentation
-->
<!-- ===================================================================
-->
- <target name="javadocs" depends="prepare-src">
-
- <!--gunzip src="${doc.generator.javadocresource}" dest="${xdocs.dir}"/-->
-
- <java fork="yes" classname="${doc.generator}"
+ <target name="javadocs" depends="package"> <!-- xalan.jar used by
doc.generator -->
+
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${name}.jar"
args="loaderConfig=${xdocs.javadocloader}
targetDirectory=${build.src} ${xdocs.javadocbook} ${xdocs.style}"/>
<mkdir dir="${build.apidocs}"/>
@@ -211,8 +205,7 @@
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"
- group="XSLT_Packages org.apache.xalan.xslt*,XPath_Packages
org.apache.xalan.xpath*"
- verbose="true"
+ group="XSLT_Packages org.apache.xalan.xslt*,XPath_Packages
org.apache.xalan.xpath*"
destdir="${build.apidocs}"
author="true"
version="true"
@@ -229,6 +222,7 @@
<target name="clean" depends="init">
<deltree dir="${build.dir}"/>
<deltree dir="${dist.dir}"/>
+ <deltree dir="${site.root}"/>
</target>
<!-- ===================================================================
-->
@@ -239,7 +233,7 @@
<mkdir dir="${dist.dir}/src"/>
<mkdir dir="${dist.dir}/xdocs"/>
<mkdir dir="${dist.dir}/docs"/>
- <mkdir dir="${dist.dir}/docs/apidocs"/>
+ <mkdir dir="${dist.dir}/docs/javadocs"/>
<mkdir dir="${dist.dir}/samples"/>
<copydir src="${build.src}" dest="${dist.dir}/src"/>
@@ -275,13 +269,25 @@
<!-- ===================================================================
-->
<target name="site" depends="javadocs">
- <mkdir dir="${build.site}"/>
- <mkdir dir="${build.site}/apidocs"/>
+ <mkdir dir="${site.dir}"/>
+ <mkdir dir="${site.dir}/apidocs"/>
- <java fork="yes" classname="${doc.generator}"
- args="targetDirectory=${build.site} ${site.book} ${xdocs.style}"/>
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${name}.jar"
+ args="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
- <copydir src="${build.apidocs}" dest="${build.site}/apidocs"/>
+ <copydir src="${build.docs}/resources"
dest="${site.dir}/docs/resources"/>
+ <copydir src="${build.apidocs}" dest="${site.dir}/apidocs"/>
</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..."/>
+ </target>
+
+ <target name="apidocs" depends="javadocs">
+ <echo message="apidocs is an alias for the javadocs task -- creates
Javadoc..."/>
+ </target>
+
</project>
