Pathconvert no longer requires that one of (targetos|pathsep|dirsep)

be set; platform defaults are used when this is the case. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277715 13f79535-47bb-0310-9956-ffa450edef68
20 years ago · 595133b251
--- a/+ 3
+++ b/+ 3
@@ -220,6 +220,9 @@ Other changes:
 * Recursive token expansion in a filterset can now be disabled by
  setting its recurse attribute to false.

 * Pathconvert no longer requires that one of (targetos|pathsep|dirsep)
  be set; platform defaults are used when this is the case.

 Fixed bugs:
 -----------

--- a/docs/manual/CoreTasks/pathconvert.html
+++ b/docs/manual/CoreTasks/pathconvert.html
@@ -7,7 +7,7 @@

 <body>

 <h2><a name="foreach">Pathconvert</a></h2>
 <h2><a name="pathconvert">Pathconvert</a></h2>
 <h3>Description</h3>
 <p>Converts a nested <code>&lt;path&gt;</code> or reference to a Path,
 FileSet, DirSet, or FileList into a path
@@ -40,10 +40,7 @@ drive letters to Unix paths, and vice-versa.</p>
        <code>pathsep</code> and <code>dirsep</code>
        according to the specified target architecture.
    </td>
    <td valign="top" align="center">
       Yes, unless <code>pathsep</code> and/or
       <code>dirsep</code> are specified.
    </td>
    <td valign="top" align="center">No</td>
  </tr>
  <tr>
    <td valign="top">dirsep</td>
@@ -185,7 +182,7 @@ list of files.
 </p>

 <hr>
 <p align="center">Copyright &copy; 2001-2004 The Apache Software Foundation.
 <p align="center">Copyright &copy; 2001-2005 The Apache Software Foundation.
 All rights Reserved.</p>
 </body>
 </html>
--- a/src/etc/testcases/taskdefs/pathconvert.xml
+++ b/src/etc/testcases/taskdefs/pathconvert.xml
@@ -18,4 +18,8 @@
        </pathconvert>
    </target>

    <target name="testnotargetos">
        <pathconvert property="result" refid="testpath" />
    </target>

 </project>
--- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
@@ -190,7 +190,7 @@ public class PathConvert extends Task {
    /**
     * Set targetos to a platform to one of
     * "windows", "unix", "netware", or "os/2";
     * defaults to the current platform.
     * current platform settings are used by default.
     * @deprecated use the method taking a TargetOs argument instead.
     * @see #setTargetos(PathConvert.TargetOs)
     */
@@ -203,7 +203,7 @@ public class PathConvert extends Task {
    /**
     * Set targetos to a platform to one of
     * "windows", "unix", "netware", or "os/2";
     * defaults to the current platform.
     * current platform settings are used by default.
     * @param target the target os
     *
     * @since Ant 1.5
@@ -437,12 +437,6 @@ public class PathConvert extends Task {
        if (property == null) {
            throw new BuildException("You must specify a property");
        }
        // Must either have a target OS or both a dirSep and pathSep

        if (targetOS == null && pathSep == null && dirSep == null) {
            throw new BuildException("You must specify at least one of "
                 + "targetOS, dirSep, or pathSep");
        }
        // Determine the separator strings.  The dirsep and pathsep attributes
        // override the targetOS settings.
        String dsep = File.separator;
--- a/src/testcases/org/apache/tools/ant/taskdefs/PathConvertTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/PathConvertTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2004 The Apache Software Foundation.
 * Copyright 2004-2005 The Apache Software Foundation.
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -43,6 +43,10 @@ public class PathConvertTest extends BuildFileTest {
        test("testmapper");
    }

    public void testNoTargetOs() {
        executeTarget("testnotargetos");
    }

    private void test(String target) {
        executeTarget(target);
        assertPropertyEquals("result", "test#" + BUILD_FILENAME);