From 008efca98bdfe5cda6c32ec75575facf7da2c687 Mon Sep 17 00:00:00 2001
From: wisberg <wisberg>
Date: Tue, 13 Jun 2006 19:45:44 +0000
Subject: Fix 136707 new logCommand option emits command line to INFO

---
 taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'taskdefs/src')

diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
index 19c4e6127..62034beb8 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -402,6 +402,9 @@ public class AjcTask extends MatchingTask {
     /** true if -XincrementalFile (i.e, setTagFile)*/
     private boolean inIncrementalFileMode; 
 
+    /** log command in non-verbose mode */
+    private boolean logCommand; 
+
     /** used when forking */
     private CommandlineJava javaCmd = new CommandlineJava();
 
@@ -447,6 +450,7 @@ public class AjcTask extends MatchingTask {
         verbose = false;
         xweaveDir = null;
         xdoneSignal = null;
+        logCommand = false;
         javaCmd = new CommandlineJava();
     }
 
@@ -495,6 +499,10 @@ public class AjcTask extends MatchingTask {
         inIncrementalMode = incremental;
     }
 
+    public void setLogCommand(boolean logCommand) {
+        this.logCommand = logCommand;
+    }
+    
     public void setHelp(boolean help) {  
         cmd.addFlag("-help", help);
     }
@@ -1063,7 +1071,11 @@ public class AjcTask extends MatchingTask {
         verifyOptions();
         try {
             String[] args = makeCommand();
-            logVerbose("ajc " + Arrays.asList(args));
+            if (logCommand) {
+                log("ajc " + Arrays.asList(args));                
+            } else {
+                logVerbose("ajc " + Arrays.asList(args));
+            }
             if (!fork) {
                 executeInSameVM(args);
             } else { // when forking, Adapter handles failonerror
-- 
cgit v1.2.3