# HG changeset patch # User ksrini # Date 1466019379 25200 # Node ID 94e7f56f371cb019f7eb14d915076d7aeb44cdd1 # Parent fdefde51141600cc655f1788b050859fb59e569e 8065831: Ensure the pack200/unpack200 help is consistent with man page Reviewed-by: mchung diff -r fdefde511416 -r 94e7f56f371c jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java Wed Jun 15 11:56:09 2016 -0700 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java Wed Jun 15 12:36:19 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,17 +61,25 @@ "Usage: pack200 [-opt... | --option=value]... x.pack[.gz] y.jar", "", "Packing Options", - " -g, --no-gzip output a plain *.pack file with no zipping", - " --gzip (default) post-process the pack output with gzip", - " -G, --strip-debug remove debugging attributes while packing", + " -r, --repack repack or normalize a jar, suitable for ", + " signing with jarsigner", + " -g, --no-gzip output a plain pack file, suitable to be", + " compressed with a file compression utility", + " --gzip (default) post compress the pack output", + " with gzip", + " -G, --strip-debug remove debugging attributes (SourceFile,", + " LineNumberTable, LocalVariableTable", + " and LocalVariableTypeTable) while packing", " -O, --no-keep-file-order do not transmit file ordering information", " --keep-file-order (default) preserve input file ordering", - " -S{N}, --segment-limit={N} output segment limit (default N=1Mb)", + " -S{N}, --segment-limit={N} limit segment sizes (default unlimited)", " -E{N}, --effort={N} packing effort (default N=5)", - " -H{h}, --deflate-hint={h} transmit deflate hint: true, false, or keep (default)", + " -H{h}, --deflate-hint={h} transmit deflate hint: true, false,", + " or keep (default)", " -m{V}, --modification-time={V} transmit modtimes: latest or keep (default)", - " -P{F}, --pass-file={F} transmit the given input element(s) uncompressed", - " -U{a}, --unknown-attribute={a} unknown attribute action: error, strip, or pass (default)", + " -P{F}, --pass-file={F} transmit the given input element(s) unchanged", + " -U{a}, --unknown-attribute={a} unknown attribute action: error, strip,", + " or pass (default)", " -C{N}={L}, --class-attribute={N}={L} (user-defined attribute)", " -F{N}={L}, --field-attribute={N}={L} (user-defined attribute)", " -M{N}={L}, --method-attribute={N}={L} (user-defined attribute)", @@ -79,7 +87,8 @@ " -f{F}, --config-file={F} read file F for Pack200.Packer properties", " -v, --verbose increase program verbosity", " -q, --quiet set verbosity to lowest level", - " -l{F}, --log-file={F} output to the given log file, or '-' for System.out", + " -l{F}, --log-file={F} output to the given log file, ", + " or '-' for System.out", " -?, -h, --help print this message", " -V, --version print program version", " -J{X} pass option X to underlying Java VM", @@ -92,18 +101,23 @@ " Layout definitions (like RUH) are defined by JSR 200.", "", "Repacking mode updates the JAR file with a pack/unpack cycle:", - " pack200 [-r|--repack] [-opt | --option=value]... [repackedy.jar] y.jar\n" + " pack200 [-r|--repack] [-opt | --option=value]... [repackedy.jar] y.jar\n", + "", + "Exit Status:", + " 0 if successful, >0 if an error occurred" } }, {UNPACK_HELP, new String[] { "Usage: unpack200 [-opt... | --option=value]... x.pack[.gz] y.jar\n", "", "Unpacking Options", - " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)", + " -H{h}, --deflate-hint={h} override transmitted deflate hint:", + " true, false, or keep (default)", " -r, --remove-pack-file remove input file after unpacking", " -v, --verbose increase program verbosity", " -q, --quiet set verbosity to lowest level", - " -l{F}, --log-file={F} output to the given log file, or '-' for System.out", + " -l{F}, --log-file={F} output to the given log file, or", + " '-' for System.out", " -?, -h, --help print this message", " -V, --version print program version", " -J{X} pass option X to underlying Java VM" diff -r fdefde511416 -r 94e7f56f371c jdk/src/jdk.pack200/share/native/unpack200/main.cpp --- a/jdk/src/jdk.pack200/share/native/unpack200/main.cpp Wed Jun 15 11:56:09 2016 -0700 +++ b/jdk/src/jdk.pack200/share/native/unpack200/main.cpp Wed Jun 15 12:36:19 2016 -0700 @@ -146,14 +146,18 @@ #define USAGE_OPTIONS \ "\n" \ "Unpacking Options\n" \ - " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n" \ + " -H{h}, --deflate-hint={h} override transmitted deflate hint:\n" \ + " true, false, or keep (default)\n" \ " -r, --remove-pack-file remove input file after unpacking\n" \ " -v, --verbose increase program verbosity\n" \ " -q, --quiet set verbosity to lowest level\n" \ - " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n" \ + " -l{F}, --log-file={F} output to the given log file,\n" \ + " or '-' for standard output (default)\n" \ " -?, -h, --help print this message\n" \ " -V, --version print program version\n" \ - " -J{X} Java VM argument (ignored)\n" + "\n" \ + "Exit Status:\n" \ + " 0 if successful, >0 if an error occurred\n" static void usage(unpacker* u, const char* progname, bool full = false) { // WinMain does not set argv[0] to the progrname