You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/05/26 00:37:57 UTC
svn commit: r660051 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sun May 25 15:37:57 2008
New Revision: 660051
URL: http://svn.apache.org/viewvc?rev=660051&view=rev
Log:
Can't merge patternsets with overlapping include/exclude entries
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=660051&r1=660050&r2=660051&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun May 25 15:37:57 2008
@@ -994,12 +994,6 @@
<include name="${extras.dir}/*.jmx"/>
</patternset>
- <!-- Keep original name for nightly builds -->
- <patternset id="dist.binaries">
- <patternset refid="dist.binaries.native"/>
- <patternset refid="dist.binaries.non.native"/>
- </patternset>
-
<!--
List of Unix executable files in the binary distribution
These need special handling to create the correct file mode
@@ -1337,7 +1331,10 @@
<tar destfile="${dist.dir}/${pack.name}.tar" longfile="gnu">
<tarfileset dir="." includes="${build.dir}/MANIFEST_BIN.MF" fullpath="${dist.name}/MANIFEST.MF"/>
<tarfileset dir="." prefix="${dist.name}" excludes="${dist.executables}" defaultexcludes="yes">
- <patternset refid="dist.binaries"/>
+ <patternset refid="dist.binaries.native"/>
+ </tarfileset>
+ <tarfileset dir="." prefix="${dist.name}" excludes="${dist.executables}" defaultexcludes="yes">
+ <patternset refid="dist.binaries.non.native"/>
</tarfileset>
<tarfileset mode="755" includes="${dist.executables}" dir="." prefix="${dist.name}" defaultexcludes="yes"/>
</tar>
@@ -1347,7 +1344,10 @@
<zip zipfile="${dist.dir}/${pack.name}.zip">
<zipfileset dir="." includes="${build.dir}/MANIFEST_BIN.MF" fullpath="${dist.name}/MANIFEST.MF"/>
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
- <patternset refid="dist.binaries"/>
+ <patternset refid="dist.binaries.native"/>
+ </zipfileset>
+ <zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
+ <patternset refid="dist.binaries.non.native"/>
</zipfileset>
</zip>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org