ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Javac.java
Date Tue, 26 Oct 2004 14:19:15 GMT
bodewig     2004/10/26 07:19:15

  Modified:    src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        Javac.java
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.115.2.7 +2 -8      ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.115.2.6
  retrieving revision 1.115.2.7
  diff -u -r1.115.2.6 -r1.115.2.7
  --- Javac.java	9 Mar 2004 17:01:33 -0000	1.115.2.6
  +++ Javac.java	26 Oct 2004 14:19:14 -0000	1.115.2.7
  @@ -849,13 +849,7 @@
       public String getCompiler() {
           String compilerImpl = getCompilerVersion();
           if (fork) {
  -            if (isJdkCompiler(compilerImpl)) {
  -                if (facade.hasBeenSet()) {
  -                    log("Since fork is true, ignoring compiler setting.",
  -                        Project.MSG_WARN);
  -                }
  -                compilerImpl = "extJavac";
  -            } else {
  +            if (!isJdkCompiler(compilerImpl)) {
                   log("Since compiler setting isn't classic or modern,"
                       + "ignoring fork setting.", Project.MSG_WARN);
               }
  
  
  

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


Mime
View raw message