From d60f1df996770b1fde0842c9476b97115964e9b8 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Thu, 6 Feb 2014 13:34:33 +0100
Subject: [PATCH] Added command line option --verbose-build and
 --verbose-upload

---
 app/src/processing/app/Base.java | 18 ++++++++++++++----
 build/shared/manpage.adoc        | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index dedab3cc8..bd4e50587 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -320,7 +320,8 @@ public class Base {
 
     boolean doUpload = false;
     boolean doVerify = false;
-    boolean doVerbose = false;
+    boolean doVerboseBuild = false;
+    boolean doVerboseUpload = false;;
     String selectBoard = null;
     String selectPort = null;
     String currentDirectory = System.getProperty("user.dir");
@@ -337,7 +338,16 @@ public class Base {
         continue;
       }
       if (args[i].equals("--verbose") || args[i].equals("-v")) {
-        doVerbose = true;
+        doVerboseBuild = true;
+        doVerboseUpload = true;
+        continue;
+      }
+      if (args[i].equals("--verbose-build")) {
+        doVerboseBuild = true;
+        continue;
+      }
+      if (args[i].equals("--verbose-upload")) {
+        doVerboseUpload = true;
         continue;
       }
       if (args[i].equals("--board")) {
@@ -414,8 +424,8 @@ public class Base {
 
     if (doUpload || doVerify) {
       // Set verbosity for command line build
-      Preferences.set("build.verbose", "" + doVerbose);
-      Preferences.set("upload.verbose", "" + doVerbose);
+      Preferences.set("build.verbose", "" + doVerboseBuild);
+      Preferences.set("upload.verbose", "" + doVerboseUpload);
 
       Editor editor = editors.get(0);
 
diff --git a/build/shared/manpage.adoc b/build/shared/manpage.adoc
index b9820014d..30f5072cd 100644
--- a/build/shared/manpage.adoc
+++ b/build/shared/manpage.adoc
@@ -86,11 +86,20 @@ OPTIONS
 	If this option is not passed, the value from the current
 	preferences is used (e.g., the last port selected in the IDE).
 
-*-v, --verbose*::
+*--verbose-build*::
+    Enable verbose mode during build. If this option is not given,
+    verbose mode during build is disabled regardless of the current
+    preferences.
 
-	Enable verbose mode during build and upload. If this option is
-	not given, verbose mode is disabled regardless of the current
-	preferences.
+*--verbose-upload*::
+    Enable verbose mode during upload. If this option is not given,
+    verbose mode during upload is disabled regardless of the current
+    preferences.
+
+*-v, --verbose*::
+	Enable verbose mode during build and upload.
+    This option has the same effect of using both *--verbose-build*
+    and *--verbose-upload*.
 
 *--preferences-file* __filename__::
 	Read and store preferences from the specified __filename__ instead