From 6f9d077e0d27ed4921527cc4dc77b92ae6aabd12 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 2 Dec 2010 20:35:15 +0000
Subject: [PATCH] Add an embedded distribution to the release build

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1041573 13f79535-47bb-0310-9956-ffa450edef68
---
 BUILDING.txt |  8 +++++---
 build.xml    | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 6b5eb3026..89dc46f76 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -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
diff --git a/build.xml b/build.xml
index 7ee8c8de2..31060cdae 100644
--- a/build.xml
+++ b/build.xml
@@ -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 for Win64 AMD64/EMT64 platform.
       </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 -->
-- 
2.11.0