Return-Path: 
 <ant-dev-return-30627-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 82904 invoked from network); 19 Apr 2002 12:13:11 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 19 Apr 2002 12:13:11 -0000
Received: (qmail 27525 invoked by uid 97); 19 Apr 2002 12:13:09 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 27504 invoked by uid 97); 19 Apr 2002 12:13:08 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 27467 invoked by uid 97); 19 Apr 2002 12:13:07 -0000
Date: 19 Apr 2002 12:12:57 -0000
Message-ID: <20020419121257.23966.qmail@icarus.apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit:
 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers
 DefaultCompilerAdapter.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bodewig     02/04/19 05:12:57

  Modified:    src/main/org/apache/tools/ant/taskdefs/compilers
                        DefaultCompilerAdapter.java
  Log:
  I've forgotten that one can set <javac>'s fork option via
  build.compiler as well.
  
  Revision  Changes    Path
  1.27      +4 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- DefaultCompilerAdapter.java	18 Apr 2002 14:18:59 -0000	1.26
  +++ DefaultCompilerAdapter.java	19 Apr 2002 12:12:57 -0000	1.27
  @@ -472,6 +472,8 @@
       protected boolean assumeJava11() {
           return "javac1.1".equals(attributes.getCompilerVersion()) ||
               ("classic".equals(attributes.getCompilerVersion()) 
  +             && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) ||
  +            ("extJavac".equals(attributes.getCompilerVersion()) 
                && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1));
       }
   
  @@ -482,6 +484,8 @@
       protected boolean assumeJava12() {
           return "javac1.2".equals(attributes.getCompilerVersion()) ||
               ("classic".equals(attributes.getCompilerVersion()) 
  +             && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)) ||
  +            ("extJavac".equals(attributes.getCompilerVersion()) 
                && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2));
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>