rubys 01/06/08 12:39:50
Modified: src/main/org/apache/tools/ant/taskdefs Javac.java
src/main/org/apache/tools/ant/taskdefs/optional Javah.java
Log:
Prep for JDK 1.4.
Note: I did a complete scan of the code. Mostly it the version checks are
safe (e.g., things not supported with 1.1). The only place where it wasn't
obvious to me was RMIC, but it seemed OK.
Revision Changes Path
1.65 +2 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Javac.java 2001/01/12 14:08:50 1.64
+++ Javac.java 2001/06/08 19:39:47 1.65
@@ -438,7 +438,8 @@
String compiler = project.getProperty("build.compiler");
if (compiler == null) {
- if (Project.getJavaVersion().startsWith("1.3")) {
+ if (Project.getJavaVersion() != Project.JAVA_1_1 &&
+ Project.getJavaVersion() != Project.JAVA_1_2) {
compiler = "modern";
} else {
compiler = "classic";
1.3 +2 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
Index: Javah.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Javah.java 2001/03/09 08:57:40 1.2
+++ Javah.java 2001/06/08 19:39:49 1.3
@@ -276,7 +276,8 @@
String compiler = project.getProperty("build.compiler");
if (compiler == null) {
- if (Project.getJavaVersion().startsWith("1.3")) {
+ if (Project.getJavaVersion() != Project.JAVA_1_1 &&
+ Project.getJavaVersion() != Project.JAVA_1_2) {
compiler = "modern";
} else {
compiler = "classic";
