From cec95817bbeddf06ca0278d05dbd4ffa6e3a40cc Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sun, 23 Apr 2017 16:07:37 +0200
Subject: [PATCH] make bootstrap work on Windows

https://bz.apache.org/bugzilla/show_bug.cgi?id=61027
---
 WHATSNEW  |  3 +++
 build.xml | 28 +++++++++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 1475aecc4..93cce3858 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -8,6 +8,9 @@ Fixed bugs:
    value.
    Bugzilla Report 60767
 
+ * bootstrapping Ant on Windows failed
+   Bugzilla Report 61027
+
 Other changes:
 --------------
 
diff --git a/build.xml b/build.xml
index a576e1086..f7b2fbbc9 100644
--- a/build.xml
+++ b/build.xml
@@ -101,6 +101,7 @@
   -->
   <property name="debug" value="true"/>
   <property name="setpermissions.fail" value="true"/>
+  <property name="setpermissions.nonposixmode" value="tryDosOrPass"/>
   <property name="deprecation" value="false"/>
   <property name="optimize" value="true"/>
   <property name="javac.target" value="1.8"/>
@@ -924,13 +925,16 @@
       <include name="*.pl"/>
     </fixcrlf>
 
-    <setpermissions mode="755" failonerror="${setpermissions.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <dirset dir="${dist.dir}"/>
     </setpermissions>
-    <setpermissions mode="644" failonerror="${setpermissions.fail}">
+    <setpermissions mode="644" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${dist.dir}"/>
     </setpermissions>
-    <setpermissions mode="755" failonerror="${setpermissions.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${dist.bin}">
         <include name="**/ant"/>
         <include name="**/antRun"/>
@@ -1038,13 +1042,16 @@
       </fileset>
     </copy>
 
-    <setpermissions mode="755" failonerror="${setpermissions.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <dirset dir="${dist.dir}"/>
     </setpermissions>
-    <setpermissions mode="644" failonerror="${setpermissions.fail}">
+    <setpermissions mode="644" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${dist.dir}"/>
     </setpermissions>
-    <setpermissions mode="755" failonerror="${setpermissions.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${dist.bin}">
         <include name="**/ant"/>
         <include name="**/antRun"/>
@@ -1158,13 +1165,16 @@
       <exclude name="${tests.etc.dir}/taskdefs/fixcrlf/input/Junk?.java"/>
     </fixcrlf>
 
-    <setpermissions mode="755" failonerror="${setpermissions.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <dirset dir="${src.dist.dir}"/>
     </setpermissions>
-    <setpermissions mode="644" failonerror="${setpermissions.fail}">
+    <setpermissions mode="644" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${src.dist.dir}"/>
     </setpermissions>
-    <setpermissions mode="755" failonerror="${setpermissions.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${src.dist.dir}">
         <include name="**/*.sh"/>
         <include name="**/*.pl"/>