From a5360da98a0596f6db64a82f72315ea481d52865 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Sat, 7 Oct 2006 22:04:20 +0000
Subject: [PATCH]  PathConvert on Windows should process forward and back
 slashes equivalently. Bugzilla report 32884.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454032 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  3 +++
 docs/manual/CoreTasks/pathconvert.html        | 23 +++++++++++++++----
 .../tools/ant/taskdefs/PathConvert.java       |  7 ++++--
 .../antunit/taskdefs/pathconvert-test.xml     |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 2dcc80615..41f4d4471 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -48,6 +48,9 @@ Fixed bugs:
 * junit4 did not work with fork=no and junit4 in $ANT_HOME/lib.
   Bugzilla report 40697.
 
+* PathConvert on Windows should process forward and back slashes equivalently.
+  Bugzilla report 32884.
+
 Other changes:
 --------------
 
diff --git a/docs/manual/CoreTasks/pathconvert.html b/docs/manual/CoreTasks/pathconvert.html
index 18c1aba3d..080190280 100644
--- a/docs/manual/CoreTasks/pathconvert.html
+++ b/docs/manual/CoreTasks/pathconvert.html
@@ -107,9 +107,13 @@ drive letters to Unix paths, and vice-versa.</p>
   </tr>
   <tr>
     <td valign="top">from</td>
-    <td valign="top">The prefix to match.  Note that this value is case-insensitive when
-    the build is running on a Windows platform and case-sensitive when running on a
-    Unix platform.</td>
+    <td valign="top">
+      The prefix to match.  Note that this value is case-insensitive when
+      the build is running on a Windows platform and case-sensitive 
+      when running on a Unix platform.
+      <em>Since Ant 1.7.0</em>, on Windows this value is also insensitive
+      to the slash style used for directories, one can use '/' or '\'.
+    </td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
@@ -197,8 +201,17 @@ it defaults to the appropriate character for the current platform.  Such a list
 then be used in another task, like <tt>javadoc</tt>, that requires a comma separated
 list of files.
 </p>
-
-
+<h4>Example 4</h4>
+<pre>
+    &lt;pathconvert property="prop" dirsep="|"&gt;
+      &lt;map from="${basedir}/abc/" to=''/&gt;
+      &lt;path location="abc/def/ghi"/&gt;
+    &lt;/pathconvert&gt;
+</pre>
+  <p>
+    This example sets the property "prop" to "def|ghi" on
+    Windows and on Unix.
+  </p>
 </body>
 </html>
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
index 52a37adfa..a3cfb9b48 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
@@ -139,8 +139,11 @@ public class PathConvert extends Task {
                      + "in a map entry");
             }
             // If we're on windows, then do the comparison ignoring case
-            String cmpElem = onWindows ? elem.toLowerCase() : elem;
-            String cmpFrom = onWindows ? from.toLowerCase() : from;
+            // and treat the two directory characters the same
+            String cmpElem =
+                onWindows ? elem.toLowerCase().replace('\\', '/') : elem;
+            String cmpFrom =
+                onWindows ? from.toLowerCase().replace('\\', '/') : from;
 
             // If the element starts with the configured prefix, then
             // convert the prefix to the configured 'to' value.
diff --git a/src/tests/antunit/taskdefs/pathconvert-test.xml b/src/tests/antunit/taskdefs/pathconvert-test.xml
index 2e0052456..b5c43743e 100644
--- a/src/tests/antunit/taskdefs/pathconvert-test.xml
+++ b/src/tests/antunit/taskdefs/pathconvert-test.xml
@@ -3,7 +3,7 @@
   <target name="test-dir-char">
     <pathconvert property="def|ghi" dirsep="|">
       <map from="${basedir}/abc/" to=''/>
-      <path path="${basedir}/abc/def/ghi"/>
+      <path location="abc/def/ghi"/>
     </pathconvert>
     <au:assertTrue>
       <equals arg1="${def|ghi}" arg2="def|ghi"/>