Make <javac> always add +F to the jikes command line if

build.compiler.fulldepend has been set.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268115 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 5 deletions

diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 2cbdf887b..754c3b11e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -703,11 +703,6 @@ public class Javac extends MatchingTask {
         }
         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 @@ public class Javac extends MatchingTask {
             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);