From 022d5509096289b1e2cd997bd36256028c33d59d Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Wed, 19 Dec 2012 10:32:29 +0100
Subject: [PATCH] Extended command line flags

---
 app/src/processing/app/Base.java | 43 +++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 99334e604..f54b26569 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -278,6 +278,8 @@ public class Base {
 
     boolean opened = false;
     boolean doUpload = false;
+    boolean doVerify = false;
+    boolean doVerbose = false;
     String selectBoard = null;
     String selectPort = null;
     // Check if any files were passed in on the command line
@@ -286,6 +288,14 @@ public class Base {
         doUpload = true;
         continue;
       }
+      if (args[i].equals("--verify")) {
+        doVerify = true;
+        continue;
+      }
+      if (args[i].equals("--verbose") || args[i].equals("-v")) {
+        doVerbose = true;
+        continue;
+      }
       if (args[i].equals("--board")) {
         i++;
         if (i < args.length)
@@ -316,16 +326,37 @@ public class Base {
       }
     }
 
-    if (doUpload) {
-      if (!opened)
-        throw new Exception(_("Can't open source sketch!"));
+    if (doUpload || doVerify) {
+      if (!opened) {
+        System.out.println(_("Can't open source sketch!"));
+        System.exit(2);
+      }
       Thread.sleep(2000);
+      // Set verbosity for command line build
+      Preferences.set("build.verbose", "" + doVerbose);
+      Preferences.set("upload.verbose", "" + doVerbose);
+
+      // Do board selection if requested
       Editor editor = editors.get(0);
-      if (selectPort != null)
-        editor.selectSerialPort(selectPort);
       if (selectBoard != null)
         selectBoard(selectBoard, editor);
-      editor.exportHandler.run();
+      
+      if (doUpload) {
+        // Build and upload
+        if (selectPort != null)
+          editor.selectSerialPort(selectPort);
+        editor.exportHandler.run();
+      } else {
+        // Build only
+        editor.runHandler.run();
+      }
+      
+      // Error during build or upload
+      int res = editor.status.mode;
+      if (res == EditorStatus.ERR)
+        System.exit(1);
+      
+      // No errors exit gracefully
       System.exit(0);
     }