remm 2003/03/15 01:04:52
Modified: . build.xml
Log:
- Copy the declarations for manager and admin (now I know Costin doesn't
test anything ;-) ).
- Update release to include the embed distro.
Revision Changes Path
1.113 +41 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- build.xml 14 Mar 2003 22:45:33 -0000 1.112
+++ build.xml 15 Mar 2003 09:04:52 -0000 1.113
@@ -47,6 +47,7 @@
<property name="build.home" value="${tomcat.build}"/>
<property name="tomcat.dist" value="${basedir}/dist"/>
+ <property name="tomcat.embed" value="${basedir}/embed"/>
<property name="tomcat.release" value="${basedir}/release"/>
<property name="webapps.build" value="${catalina.home}/webapps/build"/>
<property name="webapps.dist" value="${catalina.home}/webapps/dist"/>
@@ -576,6 +577,12 @@
<copy file="./CHANGELOG"
tofile="${tomcat.build}/webapps/tomcat-docs/CHANGELOG.txt" />
+ <!-- Add XML declarations for admin and manager -->
+ <move file="${tomcat.build}/server/webapps/manager/manager.xml"
+ todir="${tomcat.build}/webapps" />
+ <move file="${tomcat.build}/server/webapps/admin/admin.xml"
+ todir="${tomcat.build}/webapps" />
+
</target>
<!-- ====================== Embeded target =================== -->
@@ -1097,7 +1104,7 @@
<!-- ==================== RELEASE: Create Release ======================= -->
- <target name="release"
depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-src-zip,package-src-tgz"
+ <target name="release"
depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-src-zip,package-src-tgz"
description="Create a Tomcat 5 packaged distribution">
<filter token="VERSION" value="${version}"/>
@@ -1153,6 +1160,21 @@
</zip>
</target>
+ <target name="package-embed-zip">
+ <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-embed.zip">
+ <zipfileset dir="${tomcat.embed}" prefix="${final.name}-embed"
+ includes="**" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
+ includes="LICENSE" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
+ includes="README.txt" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
+ includes="RELEASE-NOTES" />
+ <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
+ includes="CHANGELOG" />
+ </zip>
+ </target>
+
<target name="prepare-release">
<mkdir dir="${tomcat.release}"/>
@@ -1213,6 +1235,24 @@
<exclude name="bin/shutdown.sh" />
<exclude name="bin/tool-wrapper.sh" />
<exclude name="src/**" />
+ </tarfileset>
+ </tar>
+ </target>
+
+ <target name="package-embed-tgz">
+ <fixcrlf srcdir="${tomcat.dist}"
+ includes="*.txt,LICENSE" eol="lf"/>
+ <fixcrlf srcdir="${tomcat.embed}" includes="*.xml" eol="lf"/>
+ <tar longfile="gnu" compression="gzip"
+ tarfile="${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz">
+ <tarfileset dir="${tomcat.dist}" prefix="${final.name}-embed">
+ <include name="LICENSE" />
+ <include name="README.txt" />
+ <include name="RELEASE-NOTES" />
+ <include name="CHANGELOG" />
+ </tarfileset>
+ <tarfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
+ <include name="**" />
</tarfileset>
</tar>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
