commit 52fa955239c00ae00f03354a2c6145730325a5f2
author Jaikiran Pai <jaikiran@apache.org> Thu Aug 18 19:10:13 2022 +0530
committer Jaikiran Pai <jaikiran@apache.org> Thu Aug 18 19:14:02 2022 +0530
tree 78d69938fa9b8df8cd97d03cd31124410f23bc11
parent b9272756fc2ea5ee9b2f8c30bc9155b1afa59195

bz-66164 Don't change file permissions on unrelated files in dest directory, when building and copying over Ant distribution

WHATSNEW

diff --git a/WHATSNEW b/WHATSNEW
index c684322..c0fe5ea 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -33,6 +33,12 @@
    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:
 --------------
 

build.xml

diff --git a/build.xml b/build.xml
index 8d401aa..48378b0 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"/>

manual/install.html

diff --git a/manual/install.html b/manual/install.html
index c959dbe..1aef1c7 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -697,6 +697,7 @@
 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>