Browse Source

Make detection system for java|javac|javadoc fallback to *.exe instead

of * on dos based systems.

PR: 7117


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271929 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
eb81bd4f4e
3 changed files with 6 additions and 5 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Javac.java
  2. +4
    -3
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  3. +1
    -1
      src/main/org/apache/tools/ant/types/CommandlineJava.java

+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/Javac.java View File

@@ -727,7 +727,7 @@ public class Javac extends MatchingTask {
if (jExecutable.exists() && !Os.isFamily("netware")) {
return jExecutable.getAbsolutePath();
} else {
return "javac";
return "javac" + extension;
}
}



+ 4
- 3
src/main/org/apache/tools/ant/taskdefs/Javadoc.java View File

@@ -1367,10 +1367,11 @@ public class Javadoc extends Task {
return jdocExecutable.getAbsolutePath();
} else {
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;
}
}



+ 1
- 1
src/main/org/apache/tools/ant/types/CommandlineJava.java View File

@@ -389,7 +389,7 @@ public class CommandlineJava implements Cloneable {
// <JTULLEY@novell.com>
return jExecutable.getAbsolutePath();
} else {
return "java";
return "java" + extension;
}
}


Loading…
Cancel
Save