Skip to content

Commit

Permalink
bz-66164 Don't change file permissions on unrelated files in dest dir…
Browse files Browse the repository at this point in the history
…ectory, when building and copying over Ant distribution
  • Loading branch information
jaikiran committed Aug 18, 2022
1 parent b927275 commit 52fa955
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
6 changes: 6 additions & 0 deletions WHATSNEW
Original file line number Diff line number Diff line change
Expand Up @@ -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:
--------------

Expand Down
16 changes: 0 additions & 16 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1057,14 +1057,6 @@
<include name="*.pl"/>
</fixcrlf>

<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}">
Expand Down Expand Up @@ -1158,14 +1150,6 @@
</fileset>
</copy>

<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}">
Expand Down
1 change: 1 addition & 0 deletions manual/install.html
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,7 @@ <h2 id="buildingant">Building Ant</h2>
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>
Expand Down

0 comments on commit 52fa955

Please sign in to comment.