summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaikiran Pai <jaikiran@apache.org>2022-08-18 19:10:13 +0530
committerJaikiran Pai <jaikiran@apache.org>2022-08-18 19:14:02 +0530
commit52fa955239c00ae00f03354a2c6145730325a5f2 (patch)
tree78d69938fa9b8df8cd97d03cd31124410f23bc11
parentb9272756fc2ea5ee9b2f8c30bc9155b1afa59195 (diff)
downloadant-52fa955239c00ae00f03354a2c6145730325a5f2.tar.gz
bz-66164 Don't change file permissions on unrelated files in dest directory, when building and copying over Ant distribution
-rw-r--r--WHATSNEW6
-rw-r--r--build.xml16
-rw-r--r--manual/install.html1
3 files changed, 7 insertions, 16 deletions
diff --git a/WHATSNEW b/WHATSNEW
index c684322bd..c0fe5ea7d 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -33,6 +33,12 @@ Fixed bugs:
failed to download JAI.
Github Pull Request #191
+ * When building and installing Ant distribution from source, the build script
+ would change permissions on unrelated files in the destination directory.
+ This is now fixed and such unrelated files in the destination directory
+ will be left untouched.
+ Bugzilla Report 66164
+
Other changes:
--------------
diff --git a/build.xml b/build.xml
index 8d401aac7..48378b078 100644
--- a/build.xml
+++ b/build.xml
@@ -1059,14 +1059,6 @@
<setpermissions mode="755" failonerror="${setpermissions.fail}"
nonPosixMode="${setpermissions.nonposixmode}">
- <dirset dir="${dist.dir}"/>
- </setpermissions>
- <setpermissions mode="644" failonerror="${setpermissions.fail}"
- nonPosixMode="${setpermissions.nonposixmode}">
- <fileset dir="${dist.dir}"/>
- </setpermissions>
- <setpermissions mode="755" failonerror="${setpermissions.fail}"
- nonPosixMode="${setpermissions.nonposixmode}">
<fileset dir="${dist.bin}">
<include name="**/ant"/>
<include name="**/antRun"/>
@@ -1160,14 +1152,6 @@
<setpermissions mode="755" failonerror="${setpermissions.fail}"
nonPosixMode="${setpermissions.nonposixmode}">
- <dirset dir="${dist.dir}"/>
- </setpermissions>
- <setpermissions mode="644" failonerror="${setpermissions.fail}"
- nonPosixMode="${setpermissions.nonposixmode}">
- <fileset dir="${dist.dir}"/>
- </setpermissions>
- <setpermissions mode="755" failonerror="${setpermissions.fail}"
- nonPosixMode="${setpermissions.nonposixmode}">
<fileset dir="${dist.bin}">
<include name="**/ant"/>
<include name="**/antRun"/>
diff --git a/manual/install.html b/manual/install.html
index c959dbe9e..1aef1c709 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -697,6 +697,7 @@ from <a href="https://junit.org/" target="_top">JUnit.org</a>) if you are using
Your are now ready to build Ant:
</p>
<blockquote>
+ <b>It is highly recommended that the directory path that you pass to dist.dir, in the following commands, points to an empty directory</b>
<p><kbd>build -Ddist.dir=&lt;<i>directory-to-contain-Ant-distribution</i>&gt; dist</kbd>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Windows</em>)</p>
<p><kbd>sh build.sh -Ddist.dir=&lt;<i>directory-to-contain-Ant-distribution</i>&gt; dist</kbd>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Unix</em>)</p>
</blockquote>