dleslie 00/06/13 12:38:15
Modified: . build.bat build.sh build.xml
Added: . ant.jar xml.jar
Log:
Added GUnzip task to Ant from the repository (not yet in the
distribution. Also added an ExpandTar task. We need both of these
to expand xml-site-style.tar.gz for our builds and user builds.
Also included xml.jar and ant.jar, so that users can readily use
the ant build (as in Cocoon). Xml.jar is updated to contain
GUnZip, ExpandTask, and a version of the Javadoc task
updated to handle grouping properly. I am submitting these changes
to be incorporated in the core Ant tool.
Revision Changes Path
1.3 +2 -3 xml-xalan/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/build.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.bat 2000/06/13 12:53:54 1.2
+++ build.bat 2000/06/13 19:38:12 1.3
@@ -6,11 +6,10 @@
echo Xalan-J Build
echo -------------
-set ANT_HOME=\jakarta-ant
set SERVLET=\jswdk-1.0.1\lib\servlet.jar
-set ANT=%ANT_HOME%\lib\ant.jar
-set XML=%ANT_HOME%\lib\xml.jar
+set ANT=ant.jar
+set XML=xml.jar
set JAVAC=%JAVA_HOME%\lib\tools.jar
set JAXP=
set XERCES=xerces.jar
1.3 +2 -2 xml-xalan/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xalan/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 2000/06/13 13:19:58 1.2
+++ build.sh 2000/06/13 19:38:13 1.3
@@ -14,8 +14,8 @@
SERVLET=\jswdk-1.0.1\lib\servlet.jar
-ANT=%ANT_HOME%\lib\ant.jar
-XML=%ANT_HOME%\lib\xml.jar
+ANT=ant.jar
+XML=xml.jar
JAVAC=%JAVA_HOME%\lib\tools.jar
JAXP=
XERCES=xerces.jar
1.9 +8 -6 xml-xalan/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2000/06/13 13:24:46 1.8
+++ build.xml 2000/06/13 19:38:13 1.9
@@ -11,7 +11,6 @@
Then you should
- - set the ANT_HOME environment variable to the jakarta-ant root
directory
- 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).
@@ -57,7 +56,7 @@
Copyright:
Copyright (c) 1999-2000 The Apache Software Foundation.
- $Id: build.xml,v 1.8 2000/06/13 13:24:46 dleslie Exp $
+ $Id: build.xml,v 1.9 2000/06/13 19:38:13 dleslie Exp $
==================================================================== -->
@@ -88,7 +87,8 @@
<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.javadocresource"
value="${xdocs.dir}/xml-site-style.tar.gz"/>
+ <property name="doc.generator.style"
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"/>
@@ -105,9 +105,11 @@
</target>
<!-- ===================================================================
-->
- <!-- Prepares the build directory
-->
+ <!-- Prepares the xdocs/style and the build directories
-->
<!-- ===================================================================
-->
<target name="prepare" depends="init">
+ <gunzip src="${doc.generator.style}"/>
+ <expandtar src="${doc.generator.styletar}"/>
<mkdir dir="${build.dir}"/>
</target>
@@ -183,7 +185,7 @@
<!-- ===================================================================
-->
<!-- Generate HTML docs
-->
<!-- ===================================================================
-->
- <target name="docs" depends="init">
+ <target name="docs" depends="prepare">
<mkdir dir="${build.docs}"/>
<java fork="yes" classname="${doc.generator}"
args="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
@@ -274,6 +276,6 @@
args="targetDirectory=${build.site} ${site.book} ${xdocs.style}"/>
<copydir src="${build.apidocs}" dest="${build.site}/apidocs"/>
- </target>
-
+ </target>
+
</project>
1.1 xml-xalan/ant.jar
<<Binary file>>
1.1 xml-xalan/xml.jar
<<Binary file>>
