of * on dos based systems. PR: 7117 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271929 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -727,7 +727,7 @@ public class Javac extends MatchingTask { | |||||
| if (jExecutable.exists() && !Os.isFamily("netware")) { | if (jExecutable.exists() && !Os.isFamily("netware")) { | ||||
| return jExecutable.getAbsolutePath(); | return jExecutable.getAbsolutePath(); | ||||
| } else { | } else { | ||||
| return "javac"; | |||||
| return "javac" + extension; | |||||
| } | } | ||||
| } | } | ||||
| @@ -1367,10 +1367,11 @@ public class Javadoc extends Task { | |||||
| return jdocExecutable.getAbsolutePath(); | return jdocExecutable.getAbsolutePath(); | ||||
| } else { | } else { | ||||
| if (!Os.isFamily("netware")) { | if (!Os.isFamily("netware")) { | ||||
| log( "Unable to locate " + jdocExecutable.getAbsolutePath() + | |||||
| ". Using \"javadoc\" instead.", Project.MSG_VERBOSE ); | |||||
| log( "Unable to locate " + jdocExecutable.getAbsolutePath() | |||||
| + ". Using \"javadoc" + extension | |||||
| + "\" instead.", Project.MSG_VERBOSE ); | |||||
| } | } | ||||
| return "javadoc"; | |||||
| return "javadoc" + extension; | |||||
| } | } | ||||
| } | } | ||||
| @@ -389,7 +389,7 @@ public class CommandlineJava implements Cloneable { | |||||
| // <JTULLEY@novell.com> | // <JTULLEY@novell.com> | ||||
| return jExecutable.getAbsolutePath(); | return jExecutable.getAbsolutePath(); | ||||
| } else { | } else { | ||||
| return "java"; | |||||
| return "java" + extension; | |||||
| } | } | ||||
| } | } | ||||