Author: sebb
Date: Thu Sep 20 11:38:56 2007
New Revision: 577862
URL: http://svn.apache.org/viewvc?rev=577862&view=rev
Log:
Ensure 3rd party licenses are in external.jars fileset
jmeter.sh needs to be executable
Modified:
jakarta/jmeter/branches/rel-2-2/build.xml
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/branches/rel-2-2/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.xml?rev=577862&r1=577861&r2=577862&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Thu Sep 20 11:38:56 2007
@@ -284,11 +284,10 @@
<!-- Jars for binary release -->
<patternset id="external.jars">
<include name="LICENSE"/>
+ <include name="LICENSE*.txt"/>
<include name="NOTICE"/>
<include name="README"/>
<include name="MANIFEST"/>
- <include name="${lib.dir}/*.html"/>
- <include name="${lib.dir}/LICENSE*.*"/>
<include name="${avalon-framework.jar}"/>
<include name="${apache-bsf.jar}"/>
<include name="${jakarta-oro.jar}"/>
@@ -1019,12 +1018,10 @@
List of Unix executable files in the binary distribution
These need special handling to create the correct file mode
-->
- <property name="dist.executables" value="${dest.jar.jmeter}/jmeter
${dest.jar.jmeter}/jmeter-server"/>
+ <property name="dist.executables" value="${dest.jar.jmeter}/jmeter
${dest.jar.jmeter}/jmeter.sh ${dest.jar.jmeter}/jmeter-server"/>
<patternset id="dist.sources">
<include name="LICENSE"/>
- <include name="LICENSE*.txt"/>
- <include name="LICENSE*.html"/>
<include name="NOTICE"/>
<include name="README"/>
<include name="MANIFEST"/>
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=577862&r1=577861&r2=577862&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Thu Sep 20 11:38:56 2007
@@ -284,11 +284,10 @@
<!-- Jars for binary release -->
<patternset id="external.jars">
<include name="LICENSE"/>
+ <include name="LICENSE*.txt"/>
<include name="NOTICE"/>
<include name="README"/>
<include name="MANIFEST"/>
- <include name="${lib.dir}/*.html"/>
- <include name="${lib.dir}/LICENSE*.*"/>
<include name="${avalon-framework.jar}"/>
<include name="${apache-bsf.jar}"/>
<include name="${jakarta-oro.jar}"/>
@@ -1029,12 +1028,10 @@
List of Unix executable files in the binary distribution
These need special handling to create the correct file mode
-->
- <property name="dist.executables" value="${dest.jar.jmeter}/jmeter
${dest.jar.jmeter}/jmeter-server"/>
+ <property name="dist.executables" value="${dest.jar.jmeter}/jmeter
${dest.jar.jmeter}/jmeter.sh ${dest.jar.jmeter}/jmeter-server"/>
<patternset id="dist.sources">
<include name="LICENSE"/>
- <include name="LICENSE*.txt"/>
- <include name="LICENSE*.html"/>
<include name="NOTICE"/>
<include name="README"/>
<include name="MANIFEST"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
