dleslie 00/08/07 14:16:14
Modified: java build.xml
Log:
Segregated samples and servlet so can build samples without worrying
about additional classpath requirements for servlet.
Revision Changes Path
1.7 +32 -9 xml-xalan/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/java/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2000/08/03 19:17:45 1.6
+++ build.xml 2000/08/07 21:16:14 1.7
@@ -34,7 +34,7 @@
- Much of this file stolen from Stefano's xml-xerces build.xml
- $Id: build.xml,v 1.6 2000/08/03 19:17:45 dleslie Exp $
+ $Id: build.xml,v 1.7 2000/08/07 21:16:14 dleslie Exp $
==================================================================== -->
@@ -163,9 +163,7 @@
</target>
<!-- ===================================================================
-->
- <!-- 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
-->
+ <!-- Compiles the samples (servlet excluded) and jars the class files
-->
<!-- ===================================================================
-->
<target name="samples" depends="jar">
<property name="exclude" value="*.xml,*.xsl,*.txt,*.html.*.properties"/>
@@ -190,18 +188,27 @@
<jar jarfile="${build.samples}/$xalansamples.jar"
basedir="${build.samples}"
includes="*.class"/>
- <javac srcdir="${samples.dir}/servlet"
classpath="${java.class.path}:${xalanjar}:${servletjar}"
+ </target>
+
+ <!-- ===================================================================
-->
+ <!-- Compiles the sample servlet and jars the class files.
-->
+ <!-- The javax.servlet and javax.servlet.http packages
-->
+ <!-- must be on the classpath
-->
+ <!-- ===================================================================
-->
+
+ <target name="servlet" depends="jar">
+ <javac srcdir="${samples.dir}/servlet"
classpath="${java.class.path}:${xalanjar}:${servletjar}"
destdir="${build.samples}" excludes="${exclude}"
debug="${debug}"/>
<jar jarfile="${build.samples}/servlet/xalanservlet.jar"
basedir="${build.samples}"
includes="servlet/*.*"/>
- </target>
-
+ </target>
+
<!-- ===================================================================
-->
<!-- Generate HTML docs
-->
<!-- ===================================================================
-->
<target name="docs" depends="prepare.docs">
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${xalan1jar}"
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${xalanjar}"
args="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
</target>
@@ -238,7 +245,7 @@
<!-- ===================================================================
-->
<!-- Creates the distribution
-->
<!-- ===================================================================
-->
- <target name="dist" depends="docs,javadocs,samples">
+ <target name="dist" depends="docs,javadocs,samples,servlet">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/bin"/>
<mkdir dir="${dist.dir}/src"/>
@@ -287,4 +294,20 @@
<copydir src="${build.apidocs}" dest="${site.dir}/apidocs"/>
</target-->
+
+ <!-- =================================================================== -->
+ <!-- Compiles the source tree
-->
+ <!-- ===================================================================
-->
+ <target name="compilex" depends="prepare">
+ <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"/>
+ </target>
+
+ <!-- ===================================================================
-->
+ <!-- Creates the xalan JAR
-->
+ <!-- ===================================================================
-->
+ <target name="jarx" depends="compilex">
+ <jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}"/>
+ </target>
+
+
</project>
