cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Javac.java

[bodewig]

bodewig     00/10/20 04:36:07

  Modified:    src/main/org/apache/tools/ant/taskdefs Javac.java
  Log:
  Make <javac> always add +F to the jikes command line if
  build.compiler.fulldepend has been set.
  
  Revision  Changes    Path
  1.55      +10 -5     
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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Javac.java        2000/10/19 16:07:56     1.54
  +++ Javac.java        2000/10/20 11:36:07     1.55
  @@ -703,11 +703,6 @@
           }
           if (depend) {
               cmd.createArgument().setValue("-depend");
  -            String fullDependProperty = 
project.getProperty("build.compiler.fulldepend");
  -            if (fullDependProperty != null 
  -                && Project.toBoolean(fullDependProperty)) {
  -                cmd.createArgument().setValue("+F");
  -            }
           } 
           /**
            * XXX
  @@ -746,6 +741,16 @@
               cmd.createArgument().setValue("+P");
           }
    
  +        /**
  +         * Jikes supports something it calls "full dependency
  +         * checking", see the jikes documentation for differences
  +         * between -depend and +F.
  +         */
  +        String fullDependProperty = 
project.getProperty("build.compiler.fulldepend");
  +        if (fullDependProperty != null && 
Project.toBoolean(fullDependProperty)) {
  +            cmd.createArgument().setValue("+F");
  +        }
  +
           int firstFileName = cmd.size();
           logAndAddFilesToCompile(cmd);