Print a different help message for incremental

Change-Id: I5e115fded6cc4c1089a2713eae1b5c23f4445cf5

4 files changed, 18 insertions, 18 deletions

diff --git a/jack/rsc/help.txt b/jack/rsc/help.txt
index cce7eb5..5fc7e74 100644
--- a/jack/rsc/help.txt
+++ b/jack/rsc/help.txt
@@ -3,7 +3,6 @@
  --dx-legacy [on | off]                 : keep generation close to dx (default:
                                           on)
  --help-properties                      : display properties list
- --incremental-folder FILE              : Folder used for incremental data
  --jack-output-zip FILE                 : output jack files to this zip
  --jarjar-rules FILE                    : use this jarjar rules file (default:
                                           none)
diff --git a/jack/src/com/android/jack/CommandLine.java b/jack/src/com/android/jack/CommandLine.java
index e728f39..81f3896 100644
--- a/jack/src/com/android/jack/CommandLine.java
+++ b/jack/src/com/android/jack/CommandLine.java
@@ -29,8 +29,6 @@ import com.android.sched.util.config.expression.BooleanExpression;
 import com.android.sched.util.config.id.PropertyId;
 import com.android.sched.util.log.LoggerFactory;
 
-import org.kohsuke.args4j.CmdLineParser;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -123,17 +121,7 @@ public abstract class CommandLine {
     System.out.println("Version: " + version + '.');
   }
 
-  public static void printUsage(@Nonnull Options options) {
-    CmdLineParser parser = new CmdLineParser(options);
-
-    // TODO(jplesot) Rework because single line usage is false
-    System.out.print("Main: ");
-    parser.printSingleLineUsage(System.out);
-    System.out.println();
-    printSubUsage(System.out);
-  }
-
-  protected static void printSubUsage(PrintStream printStream) {
+  protected static void printUsage(@Nonnull PrintStream printStream) {
     InputStream is = Main.class.getResourceAsStream("/help.txt");
     if (is == null) {
       throw new AssertionError();
@@ -143,6 +131,12 @@ public abstract class CommandLine {
       css.suck();
     } catch (IOException e) {
       throw new AssertionError(e);
+    } finally {
+      try {
+        is.close();
+      } catch (IOException e) {
+        // Ignore
+      }
     }
   }
 
diff --git a/jack/src/com/android/jack/Main.java b/jack/src/com/android/jack/Main.java
index 5c4317c..21475fd 100644
--- a/jack/src/com/android/jack/Main.java
+++ b/jack/src/com/android/jack/Main.java
@@ -44,7 +44,7 @@ public abstract class Main extends CommandLine {
       Options options = parseCommandLine(args);
 
       if (options.askForHelp()) {
-        printUsage(options);
+        printUsage(System.out);
         System.exit(ExitStatus.SUCCESS);
       }
 
@@ -71,7 +71,7 @@ public abstract class Main extends CommandLine {
       System.err.println(e.getMessage());
       CmdLineParser parser = e.getParser();
       if (parser != null) {
-        printSubUsage(System.err);
+        printUsage(System.err);
       } else {
         System.err.println("Try --help for help.");
       }
diff --git a/jack/src/com/android/jack/experimental/incremental/Main.java b/jack/src/com/android/jack/experimental/incremental/Main.java
index 39f810b..c82f6d1 100644
--- a/jack/src/com/android/jack/experimental/incremental/Main.java
+++ b/jack/src/com/android/jack/experimental/incremental/Main.java
@@ -23,6 +23,7 @@ import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 
 import java.io.IOException;
+import java.io.PrintStream;
 
 import javax.annotation.Nonnull;
 
@@ -49,7 +50,7 @@ public abstract class Main extends JackIncremental {
       Options options = parseCommandLine(args);
 
       if (options.askForHelp()) {
-        printUsage(options);
+        printIncrementalUsage(System.out);
         System.exit(ExitStatus.SUCCESS);
       }
 
@@ -76,7 +77,7 @@ public abstract class Main extends JackIncremental {
       System.err.println(e.getMessage());
       CmdLineParser parser = e.getParser();
       if (parser != null) {
-        printSubUsage(System.err);
+        printIncrementalUsage(System.err);
       } else {
         System.err.println("Try --help for help.");
       }
@@ -105,4 +106,10 @@ public abstract class Main extends JackIncremental {
 
     return options;
   }
+
+  private static void printIncrementalUsage(@Nonnull PrintStream printStream) {
+    printStream.println(
+        " --incremental-folder FILE              : Folder used for incremental data");
+    printUsage(printStream);
+  }
 }