Author: markt
Date: Thu Dec 2 20:35:15 2010
New Revision: 1041573
URL: http://svn.apache.org/viewvc?rev=1041573&view=rev
Log:
Add an embedded distribution to the release build
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/build.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1041573&r1=1041572&r2=1041573&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Thu Dec 2 20:35:15 2010
@@ -133,9 +133,11 @@ The documentation can be easly built:
cd ${tomcat.source}
ant extras
-(7) Building a full release (as provided via the ASF download pages):
-
+(7) Building the embedded packages.
cd ${tomcat.source}
- ant release
+ ant embed
+(8) Building a full release (as provided via the ASF download pages):
+ cd ${tomcat.source}
+ ant release
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1041573&r1=1041572&r2=1041573&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Dec 2 20:35:15 2010
@@ -896,7 +896,7 @@
</fileset>
</txt2html>
</target>
- <target name="embed" description="Create experimental embedded jars"
+ <target name="embed-jars" description="Create experimental embedded jars"
depends="build-manifests,compile" >
<mkdir dir="${tomcat.embed}" />
@@ -943,9 +943,44 @@
</target>
- <target name="embed-release"
+ <target name="embed"
description="Creates the experimental embedded release"
- depends="embed,embed-sources,embed-extras" />
+ depends="embed-jars,embed-sources,embed-extras" >
+
+ <fixcrlf srcdir="${tomcat.embed}" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" >
+ <patternset refid="text.files" />
+ </fixcrlf>
+ <zip destfile="${tomcat.embed}/${final.name}-embed.zip">
+ <fileset dir="${tomcat.embed}">
+ <include name="**" />
+ <exclude name="*.md5" />
+ <exclude name="*.zip" />
+ <exclude name="*.tar.gz" />
+ </fileset>
+ </zip>
+ <antcall target="md5sum">
+ <param name="file" value="${tomcat.embed}/${final.name}-embed.zip" />
+ </antcall>
+
+ <fixcrlf srcdir="${tomcat.embed}" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" >
+ <patternset refid="text.files" />
+ </fixcrlf>
+ <tar longfile="gnu" compression="gzip"
+ tarfile="${tomcat.embed}/${final.name}-embed.tar.gz">
+ <tarfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
+ <include name="**" />
+ <exclude name="*.md5" />
+ <exclude name="*.zip" />
+ <exclude name="*.tar.gz" />
+ </tarfileset>
+ </tar>
+ <antcall target="md5sum">
+ <param name="file" value="${tomcat.embed}/${final.name}-embed.tar.gz" />
+ </antcall>
+
+ </target>
<target name="test-compile" depends="compile,download-test-compile" >
<mkdir dir="${test.classes}"/>
@@ -1320,7 +1355,7 @@
<mkdir dir="${tomcat.release}/v${version}/src" />
</target>
- <target name="dist-static" depends="dist-prepare, deploy, extras">
+ <target name="dist-static" depends="dist-prepare, deploy, extras, embed">
<!-- Copy the top-level documentation files -->
<copy todir="${tomcat.dist}" encoding="ISO-8859-1">
@@ -1602,6 +1637,15 @@ Apache Tomcat ${version} native binaries
</fileset>
</copy>
+ <mkdir dir="${tomcat.release}/v${version}/bin/embed" />
+ <copy todir="${tomcat.release}/v${version}/bin/embed">
+ <fileset dir="${tomcat.embed}">
+ <include name="*.zip"/>
+ <include name="*.tar.gz"/>
+ <include name="*.md5"/>
+ </fileset>
+ </copy>
+
</target>
<!-- Packages the core zip distro -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
