remm 2003/03/26 01:54:38
Modified: . build.xml
Log:
- Build JARs for webapps, in order to save space.
Revision Changes Path
1.117 +28 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- build.xml 21 Mar 2003 15:54:27 -0000 1.116
+++ build.xml 26 Mar 2003 09:54:38 -0000 1.117
@@ -545,9 +545,9 @@
<property name="flags.hide" value="true" />
</ant>
- <antcall target="fix-webapps" />
-
+ <!-- Precompiling and fixing webapps -->
<antcall target="build-webapps-precompile" />
+ <antcall target="fix-webapps" />
</target>
@@ -572,8 +572,26 @@
<copy file="./CHANGELOG"
tofile="${tomcat.build}/webapps/tomcat-docs/CHANGELOG.txt" />
+ <!-- Build JARs for webapps classes -->
+ <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
+ <jar
jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
+ index="true">
+ <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
+ <include name="**/*.class" />
+ <include name="**/*.properties" />
+ </fileset>
+ </jar>
+ <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
+ <jar
jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
+ index="true">
+ <fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
+ <include name="**/*.class" />
+ <include name="**/*.properties" />
+ </fileset>
+ </jar>
+
<!-- Add XML declarations for admin and manager -->
- <move file="${tomcat.build}/server/webapps/manager/manager.xml"
+ <copy file="${tomcat.build}/server/webapps/manager/manager.xml"
todir="${tomcat.build}/webapps" />
<copy file="${tomcat.build}/server/webapps/admin/admin.xml"
todir="${tomcat.build}/webapps" />
@@ -737,8 +755,11 @@
<!-- ====================== COMBO: Clean All Directories ================ -->
<target name="clean"
description="Clean all components">
+
<delete dir="${tomcat.build}"/>
+ <delete dir="${tomcat.embed}"/>
+
<echo>Target: Servlet API - Clean ...</echo>
<ant dir="${api.home}/jsr154" target="clean"/>
@@ -957,7 +978,10 @@
<fileset dir="${tomcat.build}/server/lib" />
</copy>
<copy todir="${tomcat.dist}/server/webapps">
- <fileset dir="${tomcat.build}/server/webapps" />
+ <fileset dir="${tomcat.build}/server/webapps">
+ <exclude name="${tomcat.build}/server/webapps/admin/WEB-INF/classes/**" />
+ <exclude name="${tomcat.build}/server/webapps/manager/WEB-INF/classes/**" />
+ </fileset>
</copy>
<!--
<copy todir="${tomcat.dist}/shared/lib">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
