From eb81bd4f4ea8ca269b8ba496e9b9a9a15b92ce2d Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 21 Mar 2002 08:19:07 +0000
Subject: [PATCH] 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
---
 src/main/org/apache/tools/ant/taskdefs/Javac.java        | 2 +-
 src/main/org/apache/tools/ant/taskdefs/Javadoc.java      | 7 ++++---
 src/main/org/apache/tools/ant/types/CommandlineJava.java | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 8b2a81dc3..ff9526b90 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -727,7 +727,7 @@ public class Javac extends MatchingTask {
         if (jExecutable.exists() && !Os.isFamily("netware")) {
             return jExecutable.getAbsolutePath();
         } else {
-            return "javac";
+            return "javac" + extension;
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index ceb51899f..888b997d6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -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;
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 0014f651d..449977ea4 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -389,7 +389,7 @@ public class CommandlineJava implements Cloneable {
             // <JTULLEY@novell.com>
             return jExecutable.getAbsolutePath();
         } else {
-            return "java";
+            return "java" + extension;
         }
     }