fix return code and other notes

benfry · benfry · commit fe693bdd5dbc · 2013-10-23T18:23:59.000-04:00
diff --git a/app/src/processing/mode/java/Commander.java b/app/src/processing/mode/java/Commander.java
@@ -156,14 +156,15 @@ public Commander(String[] args) {
 //        }
 
       } else if (arg.startsWith(bitsArg)) {
-        String bitsStr = arg.substring(bitsArg.length());
-        if (bitsStr.equals("32")) {
-          platformBits = 32;
-        } else if (bitsStr.equals("64")) {
-          platformBits = 64;
-        } else {
-          complainAndQuit("Bits should be either 32 or 64, not " + bitsStr, true);
-        }
+        complainAndQuit("The --platform option has been removed from Processing 2.1.", false);
+//        String bitsStr = arg.substring(bitsArg.length());
+//        if (bitsStr.equals("32")) {
+//          platformBits = 32;
+//        } else if (bitsStr.equals("64")) {
+//          platformBits = 64;
+//        } else {
+//          complainAndQuit("Bits should be either 32 or 64, not " + bitsStr, true);
+//        }
 
       } else if (arg.startsWith(sketchArg)) {
         sketchPath = arg.substring(sketchArg.length());
@@ -290,6 +291,7 @@ public Commander(String[] args) {
 
       } catch (SketchException re) {
         statusError(re);
+        System.exit(1);
 
       } catch (IOException e) {
         e.printStackTrace();
@@ -317,13 +319,16 @@ public void statusError(Exception exception) {
       if (codeIndex != -1) {
         // format the runner exception like emacs
         //blah.java:2:10:2:13: Syntax Error: This is a big error message
+        // Emacs doesn't like the double line thing coming from Java
+        // https://github.com/processing/processing/issues/2158
         String filename = sketch.getCode(codeIndex).getFileName();
         int line = re.getCodeLine() + 1;
         int column = re.getCodeColumn() + 1;
         //if (column == -1) column = 0;
         // TODO if column not specified, should just select the whole line.
+        // But what's the correct syntax for that?
         systemErr.println(filename + ":" +
-          line + ":" + column + ":" +
+          line + ":" + column + ":" + 
           line + ":" + column + ":" + " " + re.getMessage());
         
       } else {  // no line number, pass the trace along to the user
@@ -366,9 +371,9 @@ static void printCommandLine(PrintStream out) {
     out.println("--export             Export an application.");
 //    out.println("--platform           Specify the platform (export to application only).");
 //    out.println("                     Should be one of 'windows', 'macosx', or 'linux'.");
-    out.println("--bits               Must be specified if libraries are used that are");
-    out.println("                     32- or 64-bit specific such as the OpenGL library.");
-    out.println("                     Otherwise specify 0 or leave it out.");
+//    out.println("--bits               Must be specified if libraries are used that are");
+//    out.println("                     32- or 64-bit specific such as the OpenGL library.");
+//    out.println("                     Otherwise specify 0 or leave it out.");
     out.println();
   }
 
