This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-2.2
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-2.2 by this push:
new 72941b9 Package tools/bin scripts as executable
72941b9 is described below
commit 72941b9ec14e64af9e64365027d542b4fff41d81
Author: Angelo Polo <[email protected]>
AuthorDate: Wed Oct 21 13:09:51 2020 +0100
Package tools/bin scripts as executable
patch by Angelo Polo; reviewed by Andres de la Peña for CASSANDRA-16151
---
CHANGES.txt | 1 +
build.xml | 14 ++++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 1274689..8a78993 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.19
+ * Package tools/bin scripts as executable (CASSANDRA-16151)
* Fix ExceptionInInitializerError when data_file_directories is not set
(CASSANDRA-16008)
* Fixed a NullPointerException when calling nodetool enablethrift
(CASSANDRA-16127)
diff --git a/build.xml b/build.xml
index 2037f65..4f3818c 100644
--- a/build.xml
+++ b/build.xml
@@ -1139,14 +1139,14 @@
<!-- Shell includes in bin/ (default mode) -->
<tarfileset dir="${dist.dir}" prefix="${final.name}">
<include name="bin/*.in.sh" />
+ <include name="tools/bin/*.in.sh" />
</tarfileset>
<!-- Executable scripts in bin/ -->
<tarfileset dir="${dist.dir}" prefix="${final.name}" mode="755">
<include name="bin/*"/>
<include name="tools/bin/*"/>
- <not>
- <filename name="bin/*.in.sh" />
- </not>
+ <exclude name="bin/*.in.sh" />
+ <exclude name="tools/bin/*.in.sh" />
</tarfileset>
</tar>
@@ -1164,6 +1164,7 @@
<exclude name="conf/hotspot_compiler" />
<exclude name="doc/cql3/CQL.html" />
<exclude name="bin/*" /> <!-- handled separately below -->
+ <exclude name="tools/bin/*" /> <!-- handled separately below -->
<!-- exclude Eclipse files -->
<exclude name=".project" />
<exclude name=".classpath" />
@@ -1171,16 +1172,21 @@
<exclude name=".externalToolBuilders/**" />
</tarfileset>
- <!-- Shell includes and batch files in bin/ -->
+ <!-- Shell includes and batch files in bin/ and tools/bin/ -->
<tarfileset dir="${basedir}" prefix="${final.name}-src">
<include name="bin/*.in.sh" />
<include name="bin/*.bat" />
+ <include name="tools/bin/*.in.sh" />
+ <include name="tools/bin/*.bat" />
</tarfileset>
<!-- Everything else (assumed to be scripts), is executable -->
<tarfileset dir="${basedir}" prefix="${final.name}-src" mode="755">
<include name="bin/*"/>
<exclude name="bin/*.in.sh" />
<exclude name="bin/*.bat" />
+ <include name="tools/bin/*"/>
+ <exclude name="tools/bin/*.in.sh" />
+ <exclude name="tools/bin/*.bat" />
</tarfileset>
</tar>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
