You are viewing a plain text version of this content. The canonical link for it is here.
Posted to devnull@infra.apache.org by vl...@apache.org on 2019/06/08 18:42:23 UTC
[jmeter] 19/47: Ensure 3rd party licenses are in external.jars
fileset jmeter.sh needs to be executable
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to annotated tag v2_3
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 61a22e65a734e10387de00f6e57648da6d113561
Author: Sebastian Bazley <se...@apache.org>
AuthorDate: Thu Sep 20 18:38:56 2007 +0000
Ensure 3rd party licenses are in external.jars fileset
jmeter.sh needs to be executable
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@577862 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 8d350f27bf38dafd43bf739894574da8b3a7c226
---
build.xml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index aeaf2d4..9b31396 100644
--- a/build.xml
+++ b/build.xml
@@ -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 @@ run JMeter unless all the JMeter jars are added.
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"/>