stevel 01/11/25 23:40:48
Modified: src/main/org/apache/tools/ant/types CommandlineJava.java
Log:
tabs to spaces
Revision Changes Path
1.21 +12 -12
jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CommandlineJava.java 2001/11/02 07:56:53 1.20
+++ CommandlineJava.java 2001/11/26 07:40:48 1.21
@@ -345,26 +345,26 @@
}
private String getJavaExecutableName() {
- // This is the most common extension case - exe for windows and OS/2,
+ // This is the most common extension case - exe for windows and
OS/2,
// nothing for *nix.
- String extension = Os.isFamily("dos") ? ".exe" : "";
+ String extension = Os.isFamily("dos") ? ".exe" : "";
- // Look for java in the java.home/../bin directory. Unfortunately
- // on Windows java.home doesn't always refer to the correct location,
- // so we need to fall back to assuming java is somewhere on the
- // PATH.
- java.io.File jExecutable =
+ // Look for java in the java.home/../bin directory. Unfortunately
+ // on Windows java.home doesn't always refer to the correct
location,
+ // so we need to fall back to assuming java is somewhere on the
+ // PATH.
+ java.io.File jExecutable =
new java.io.File(System.getProperty("java.home") +
"/../bin/java" + extension );
- if (jExecutable.exists() && !Os.isFamily("netware")) {
+ if (jExecutable.exists() && !Os.isFamily("netware")) {
// NetWare may have a "java" in that directory, but 99% of
// the time, you don't want to execute it -- Jeff Tulley
// <[EMAIL PROTECTED]>
- return jExecutable.getAbsolutePath();
- } else {
- return "java";
- }
+ return jExecutable.getAbsolutePath();
+ } else {
+ return "java";
+ }
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
