This will avoid the full javadoc/examples/etc when building tomcat5,
and will also avoid some copy.
Costin
Index: jsr152/build.xml
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- jsr152/build.xml 9 Sep 2002 18:01:20 -0000 1.3
+++ jsr152/build.xml 14 Oct 2002 20:28:23 -0000
@@ -15,6 +15,7 @@
<property name="jsp-api.build" value="build"/>
<property name="jsp-api.dist" value="dist"/>
<property name="servlet-api.jar"
value="../jsr154/dist/lib/servlet-api.jar"/>
+ <property name="jsp-api.jar" value="${jsp-api.dist}/lib/jsp-api.jar"/>
<path id="examples.classpath">
<pathelement location="${jsp-api.build}/classes"/>
@@ -137,13 +138,8 @@
<!-- ===================== Distribution Files =========================
-->
- <target name="dist" depends="compile,examples,javadoc"
- description="Create binary distribution">
-
- <!-- Copy Javadocs -->
- <copy todir="${jsp-api.dist}/docs/api">
- <fileset dir="${jsp-api.build}/docs/api"/>
- </copy>
+ <target name="jar" depends="compile"
+ description="Create jar">
<!-- Prepare Manifest -->
<copy tofile="${jsp-api.build}/manifest"
@@ -155,9 +151,21 @@
</copy>
<!-- Create JAR file -->
- <jar jarfile="${jsp-api.dist}/lib/jsp-api.jar"
+ <jar jarfile="${jsp-api.jar}"
basedir="${jsp-api.build}/classes"
- manifest="${jsp-api.build}/manifest"/>
+ manifest="${jsp-api.build}/manifest">
+ <include name="javax/servlet/jsp/**" />
+ </jar>
+
+ </target>
+
+ <target name="dist" depends="compile,examples,javadoc,jar"
+ description="Create binary distribution">
+
+ <!-- Copy Javadocs -->
+ <copy todir="${jsp-api.dist}/docs/api">
+ <fileset dir="${jsp-api.build}/docs/api"/>
+ </copy>
<!-- Copy API source files -->
<copy todir="${jsp-api.dist}/src">
Index: jsr154/build.xml
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr154/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- jsr154/build.xml 27 Aug 2002 13:20:35 -0000 1.2
+++ jsr154/build.xml 14 Oct 2002 20:28:23 -0000
@@ -14,7 +14,7 @@
<property name="implementation.revision" value="public_draft"/>
<property name="servlet-api.build" value="build"/>
<property name="servlet-api.dist" value="dist"/>
-
+ <property name="servlet-api.jar"
value="${servlet-api.dist}/lib/servlet-api.jar"/>
<path id="examples.classpath">
<pathelement location="${servlet-api.build}/classes"/>
</path>
@@ -122,13 +122,8 @@
<!-- ===================== Distribution Files =========================
-->
- <target name="dist" depends="compile,examples,javadoc"
- description="Create binary distribution">
-
- <!-- Copy Javadocs -->
- <copy todir="${servlet-api.dist}/docs/api">
- <fileset dir="${servlet-api.build}/docs/api"/>
- </copy>
+ <target name="jar" depends="compile"
+ description="Create the jar">
<!-- Prepare Manifest -->
<copy tofile="${servlet-api.build}/manifest"
@@ -140,9 +135,22 @@
</copy>
<!-- Create JAR file -->
- <jar jarfile="${servlet-api.dist}/lib/servlet-api.jar"
+ <jar jarfile="${servlet-api.jar}"
basedir="${servlet-api.build}/classes"
- manifest="${servlet-api.build}/manifest"/>
+ manifest="${servlet-api.build}/manifest">
+ <include name="javax/servlet/**"/>
+ <exclude name="javax/servlet/jsp/**"/>
+ </jar>
+
+ </target>
+
+ <target name="dist" depends="compile,examples,javadoc,jar"
+ description="Create binary distribution">
+
+ <!-- Copy Javadocs -->
+ <copy todir="${servlet-api.dist}/docs/api">
+ <fileset dir="${servlet-api.build}/docs/api"/>
+ </copy>
<!-- Copy API source files -->
<copy todir="${servlet-api.dist}/src">
--
Costin
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
