You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by eh...@apache.org on 2005/05/02 03:06:15 UTC
svn commit: r165571 - /lucene/java/trunk/build.xml
Author: ehatcher
Date: Sun May 1 18:06:14 2005
New Revision: 165571
URL: http://svn.apache.org/viewcvs?rev=165571&view=rev
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=165571&r1=165570&r2=165571&view=diff
==============================================================================
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Sun May 1 18:06:14 2005
@@ -40,6 +40,17 @@
<pathelement path="${java.class.path}"/>
</path>
+ <patternset id="src.dist.patterns"
+ includes="src/,build.xml,lib/,docs/,*.txt,contrib/"
+ excludes="contrib/*/lib/"
+ />
+ <patternset id="binary.build.dist.patterns"
+ includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"
+ />
+ <patternset id="binary.root.dist.patterns"
+ includes="src/demo/,src/jsp/,build.xml,docs/,*.txt"
+ />
+
<!-- ================================================================== -->
<!-- Prepares the build directory -->
@@ -198,10 +209,12 @@
<delete file="${dist.dir}/${final.name}.zip"/>
<zip destfile="${dist.dir}/${final.name}.zip">
- <zipfileset prefix="${final.name}" dir="."
- includes="src/demo/,src/jsp/,build.xml,docs/,*.txt"/>
- <zipfileset prefix="${final.name}" dir="${build.dir}"
- includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"/>
+ <zipfileset prefix="${final.name}" dir=".">
+ <patternset refid="binary.root.dist.patterns"/>
+ </zipfileset>
+ <zipfileset prefix="${final.name}" dir="${build.dir}">
+ <patternset refid="binary.build.dist.patterns"/>
+ </zipfileset>
</zip>
</target>
@@ -217,10 +230,12 @@
<delete file="${build.dir}/${final.name}.tar"/>
<delete file="${dist.dir}/${final.name}.tar.gz"/>
<tar tarfile="${build.dir}/${final.name}.tar">
- <tarfileset prefix="${final.name}" dir="."
- includes="src/demo/,src/jsp/,build.xml,docs/,*.txt"/>
- <tarfileset prefix="${final.name}" dir="${build.dir}"
- includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"/>
+ <tarfileset prefix="${final.name}" dir=".">
+ <patternset refid="binary.root.dist.patterns"/>
+ </tarfileset>
+ <tarfileset prefix="${final.name}" dir="${build.dir}">
+ <patternset refid="binary.build.dist.patterns"/>
+ </tarfileset>
</tar>
<gzip zipfile="${dist.dir}/${final.name}.tar.gz"
@@ -255,9 +270,9 @@
<target name="package-zip-src" depends="init"
description="--> Generates the Lucene sources as .zip">
<zip destfile="${dist.dir}/${final.name}-src.zip">
- <zipfileset prefix="${final.name}" dir="."
- includes="src/,build.xml,lib/,docs/,*.txt,contrib/"
- excludes="contrib/*/lib/"/>
+ <zipfileset prefix="${final.name}" dir=".">
+ <patternset refid="src.dist.patterns"/>
+ </zipfileset>
</zip>
</target>
@@ -272,14 +287,14 @@
<delete file="${build.dir}/${final.name}-src.tar"/>
<delete file="${dist.dir}/${final.name}-src.tar.gz"/>
<tar tarfile="${build.dir}/${final.name}-src.tar">
- <tarfileset prefix="${final.name}" dir="."
- includes="src/,build.xml,lib/,docs/,*.txt,contrib/"
- excludes="contrib/*/lib/"/>
+ <tarfileset prefix="${final.name}" dir=".">
+ <patternset refid="src.dist.patterns"/>
+ </tarfileset>
</tar>
<gzip zipfile="${dist.dir}/${final.name}-src.tar.gz"
- src="${build.dir}/${final.name}-src.tar"
- />
+ src="${build.dir}/${final.name}-src.tar"
+ />
</target>
<!-- ================================================================== -->