Return-Path: 
 <java-commits-return-58-apmail-lucene-java-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-java-commits-archive@www.apache.org
Received: (qmail 72266 invoked from network); 2 May 2005 01:06:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 May 2005 01:06:17 -0000
Received: (qmail 1126 invoked by uid 500); 2 May 2005 01:07:40 -0000
Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org
Received: (qmail 1112 invoked by uid 500); 2 May 2005 01:07:40 -0000
Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:java-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:java-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:java-commits@lucene.apache.org>
List-Id: <java-commits.lucene.apache.org>
Reply-To: java-dev@lucene.apache.org
Delivered-To: mailing list java-commits@lucene.apache.org
Received: (qmail 1095 invoked by uid 99); 2 May 2005 01:07:40 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sun, 01 May 2005 18:07:40 -0700
Received: (qmail 72262 invoked by uid 65534); 2 May 2005 01:06:15 -0000
Message-ID: <20050502010615.72261.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r165571 - /lucene/java/trunk/build.xml
Date: Mon, 02 May 2005 01:06:15 -0000
To: java-commits@lucene.apache.org
From: ehatcher@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: ehatcher
Date: Sun May  1 18:06:14 2005
New Revision: 165571

URL: http://svn.apache.org/viewcvs?rev=3D165571&view=3Drev
Log:
aggregate duplicated distribution patterns into reusable patternsets

Modified:
    lucene/java/trunk/build.xml

Modified: lucene/java/trunk/build.xml
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/build.xml?rev=3D165571=
&r1=3D165570&r2=3D165571&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Sun May  1 18:06:14 2005
@@ -40,6 +40,17 @@
     <pathelement path=3D"${java.class.path}"/>
   </path>
=20
+  <patternset id=3D"src.dist.patterns"
+              includes=3D"src/,build.xml,lib/,docs/,*.txt,contrib/"
+              excludes=3D"contrib/*/lib/"
+  />
+  <patternset id=3D"binary.build.dist.patterns"
+              includes=3D"${final.name}.jar,${demo.war.name}.war,${demo.na=
me}.jar,docs/,contrib/*/*.jar"
+  />
+  <patternset id=3D"binary.root.dist.patterns"
+              includes=3D"src/demo/,src/jsp/,build.xml,docs/,*.txt"
+  />
+
=20
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
   <!-- Prepares the build directory                                       =
-->
@@ -198,10 +209,12 @@
=20
     <delete file=3D"${dist.dir}/${final.name}.zip"/>
     <zip destfile=3D"${dist.dir}/${final.name}.zip">
-      <zipfileset prefix=3D"${final.name}" dir=3D"."
-        includes=3D"src/demo/,src/jsp/,build.xml,docs/,*.txt"/>
-      <zipfileset prefix=3D"${final.name}" dir=3D"${build.dir}"
-        includes=3D"${final.name}.jar,${demo.war.name}.war,${demo.name}.ja=
r,docs/,contrib/*/*.jar"/>
+      <zipfileset prefix=3D"${final.name}" dir=3D".">
+        <patternset refid=3D"binary.root.dist.patterns"/>
+      </zipfileset>
+      <zipfileset prefix=3D"${final.name}" dir=3D"${build.dir}">
+        <patternset refid=3D"binary.build.dist.patterns"/>
+      </zipfileset>
     </zip>
   </target>
=20
@@ -217,10 +230,12 @@
     <delete file=3D"${build.dir}/${final.name}.tar"/>
     <delete file=3D"${dist.dir}/${final.name}.tar.gz"/>
     <tar tarfile=3D"${build.dir}/${final.name}.tar">
-      <tarfileset prefix=3D"${final.name}" dir=3D"."
-        includes=3D"src/demo/,src/jsp/,build.xml,docs/,*.txt"/>
-      <tarfileset prefix=3D"${final.name}" dir=3D"${build.dir}"
-        includes=3D"${final.name}.jar,${demo.war.name}.war,${demo.name}.ja=
r,docs/,contrib/*/*.jar"/>
+      <tarfileset prefix=3D"${final.name}" dir=3D".">
+        <patternset refid=3D"binary.root.dist.patterns"/>
+      </tarfileset>
+      <tarfileset prefix=3D"${final.name}" dir=3D"${build.dir}">
+        <patternset refid=3D"binary.build.dist.patterns"/>
+      </tarfileset>
     </tar>
=20
     <gzip zipfile=3D"${dist.dir}/${final.name}.tar.gz"
@@ -255,9 +270,9 @@
   <target name=3D"package-zip-src" depends=3D"init"
     description=3D"--> Generates the Lucene sources as .zip">
     <zip destfile=3D"${dist.dir}/${final.name}-src.zip">
-      <zipfileset prefix=3D"${final.name}" dir=3D"."
-        includes=3D"src/,build.xml,lib/,docs/,*.txt,contrib/"
-        excludes=3D"contrib/*/lib/"/>
+      <zipfileset prefix=3D"${final.name}" dir=3D".">
+        <patternset refid=3D"src.dist.patterns"/>
+      </zipfileset>
     </zip>
   </target>
=20
@@ -272,14 +287,14 @@
     <delete file=3D"${build.dir}/${final.name}-src.tar"/>
     <delete file=3D"${dist.dir}/${final.name}-src.tar.gz"/>
     <tar tarfile=3D"${build.dir}/${final.name}-src.tar">
-      <tarfileset prefix=3D"${final.name}" dir=3D"."
-        includes=3D"src/,build.xml,lib/,docs/,*.txt,contrib/"
-        excludes=3D"contrib/*/lib/"/>
+      <tarfileset prefix=3D"${final.name}" dir=3D".">
+        <patternset refid=3D"src.dist.patterns"/>
+      </tarfileset>
     </tar>
=20
     <gzip zipfile=3D"${dist.dir}/${final.name}-src.tar.gz"
-      src=3D"${build.dir}/${final.name}-src.tar"
-      />
+          src=3D"${build.dir}/${final.name}-src.tar"
+    />
   </target>
=20
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->