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:18:40 GMT
bodewig     2004/10/26 07:18:39

  Modified:    src/main/org/apache/tools/ant/taskdefs Javac.java
  Log:
  compiler attributes is used to determine command line arguments even in the fork case, this
warning is misleading.  PR: 31664
  
  Revision  Changes    Path
  1.122     +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.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- Javac.java	9 Mar 2004 16:48:05 -0000	1.121
  +++ Javac.java	26 Oct 2004 14:18:39 -0000	1.122
  @@ -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