Browse Source

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.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269132 13f79535-47bb-0310-9956-ffa450edef68
master
Sam Ruby 24 years ago
parent
commit
35aee5ccea
2 changed files with 4 additions and 2 deletions
  1. +2
    -1
      src/main/org/apache/tools/ant/taskdefs/Javac.java
  2. +2
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/Javah.java

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

@@ -438,7 +438,8 @@ public class Javac extends MatchingTask {

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";


+ 2
- 1
src/main/org/apache/tools/ant/taskdefs/optional/Javah.java View File

@@ -276,7 +276,8 @@ public class Javah extends Task {

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";


Loading…
Cancel
Save