8221779: Help text changes from JDK-8221777 and other jpackage EA5 feedback
Reviewed-by: kbr, almatvee
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties Wed Apr 03 15:43:25 2019 -0700
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties Fri Apr 05 10:55:51 2019 -0400
@@ -27,7 +27,7 @@
MSG_Help=Usage: jpackage <mode> <options>\n\
\n\
where mode is one of: \n\
-\ create-image\n\
+\ create-app-image\n\
\ Generates a platform-specific application image.\n\
\ create-installer\n\
\ Generates a platform-specific installer for the application.\n\
@@ -35,19 +35,19 @@
Sample usages:\n\
--------------\n\
\ Generate a modular application image:\n\
-\ jpackage create-image -o outputdir -n name \\\n\
-\ -m moduleName/className -p modulePath\n\
+\ jpackage create-app-image -o outputdir -n name \\\n\
+\ -p modulePath -m moduleName/className\n\
\ To provide your own options to jlink, run jlink separately:\n\
-\ jlink --output app.runtime -m moduleName -p modulePath \\\n\
+\ jlink --output appRuntimeImage -p ModulePath -m moduleName\\\n\
\ --no-header-files [<additional jlink options>...]\n\
-\ jpackage -o outputdir -n name -m moduleName/className \\\n\
-\ --runtime-image app-runtime\n\
+\ jpackage create-app-image -o outputdir -n name\\\n\
+\ -m moduleName/className --runtime-image appRuntimeIMage\n\
\ Generate a non-modular application image:\n\
-\ jpackage create-image -o outputdir -i inputdir -n name \\\n\
+\ jpackage create-app-image -o outputdir -i inputdir -n name \\\n\
\ --main-class className --main-jar MyJar.jar\n\
\ Generate an application installer:\n\
\ jpackage create-installer -o outputdir -n name \\\n\
-\ -m moduleName/className -p modulePath\n\
+\ -p modulePath -m moduleName/className\n\
\ jpackage create-installer -i inputdir -o outputdir -n name \\\n\
\ --main-class package.ClassName --main-jar MyJar.jar\n\
\ jpackage create-installer -o outputdir -n <installer-name> \\\n\
@@ -111,15 +111,14 @@
\ --add-modules is not specified.\n\
\n\
\Options for creating the application image:\n\
-\ --files -f <input file>[{0}<input file>...]\n\
-\ A {0} separated list of files in the input dir to be packaged\n\
-\ If omitted, all files in the input directory will be packaged.\n\
\ --icon <icon file path>\n\
\ Path of the icon of the application bundle\n\
\ (absolute path or relative to the current directory)\n\
\ --input -i <input path>\n\
\ Path of the input directory that contains the files to be packaged\n\
\ (absolute path or relative to the current directory)\n\
+\ All files in the input directory will be packaged into the\n\
+\ application image.\n\
\n\
\Options for creating the application launcher(s):\n\
\ --add-launcher <file path>\n\
@@ -129,7 +128,10 @@
\ "main-jar", "main-class", "arguments", "java-options",\n\
\ "app-version", "icon", and "win-console" can be used.\n\
\ These options are added to, or used to overwrite, the original\n\
-\ command line options when building an additional launcher.\n\
+\ command line options to build an additional alternative launcher.\n\
+\ The main application launcher will be built from the command line\n\
+\ options. Additional alternative launchers may be built using\n\
+\ this option.\n\
\ --arguments <main class arguments>\n\
\ Command line arguments to pass to the main class if no command\n\
\ line arguments are given to the launcher\n\
@@ -155,7 +157,7 @@
\ Location of the predefined application image that is used\n\
\ to build an installable package\n\
\ (absolute path or relative to the current directory)\n\
-\ See the create-image mode options to create the application image.\n\
+\ See create-app-image mode options to create the application image.\n\
\ --file-associations <file path>\n\
\ Path to a Properties file that contains list of key, value pairs\n\
\ (absolute path or relative to the current directory)\n\
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties Wed Apr 03 15:43:25 2019 -0700
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties Fri Apr 05 10:55:51 2019 -0400
@@ -27,7 +27,7 @@
MSG_Help=Usage: jpackage <mode> <options>\n\
\n\
where mode is one of: \n\
-\ create-image\n\
+\ create-app-image\n\
\ Generates a platform-specific application image.\n\
\ create-installer\n\
\ Generates a platform-specific installer for the application.\n\
@@ -35,19 +35,19 @@
Sample usages:\n\
--------------\n\
\ Generate a modular application image:\n\
-\ jpackage create-image -o outputdir -n name \\\n\
-\ -m moduleName/className -p modulePath\n\
+\ jpackage create-app-image -o outputdir -n name \\\n\
+\ -p modulePath -m moduleName/className\n\
\ To provide your own options to jlink, run jlink separately:\n\
-\ jlink --output app.runtime -m moduleName -p modulePath \\\n\
+\ jlink --output appRuntimeImage -p ModulePath -m moduleName\\\n\
\ --no-header-files [<additional jlink options>...]\n\
-\ jpackage -o outputdir -n name -m moduleName/className \\\n\
-\ --runtime-image app-runtime\n\
+\ jpackage create-app-image -o outputdir -n name\\\n\
+\ -m moduleName/className --runtime-image appRuntimeIMage\n\
\ Generate a non-modular application image:\n\
-\ jpackage create-image -o outputdir -i inputdir -n name \\\n\
+\ jpackage create-app-image -o outputdir -i inputdir -n name \\\n\
\ --main-class className --main-jar MyJar.jar\n\
\ Generate an application installer:\n\
\ jpackage create-installer -o outputdir -n name \\\n\
-\ -m moduleName/className -p modulePath\n\
+\ -p modulePath -m moduleName/className\n\
\ jpackage create-installer -i inputdir -o outputdir -n name \\\n\
\ --main-class package.ClassName --main-jar MyJar.jar\n\
\ jpackage create-installer -o outputdir -n <installer-name> \\\n\
@@ -111,15 +111,14 @@
\ --add-modules is not specified.\n\
\n\
\Options for creating the application image:\n\
-\ --files -f <input file>[{0}<input file>...]\n\
-\ A {0} separated list of files in the input dir to be packaged\n\
-\ If omitted, all files in the input directory will be packaged.\n\
\ --icon <icon file path>\n\
\ Path of the icon of the application bundle\n\
\ (absolute path or relative to the current directory)\n\
\ --input -i <input path>\n\
\ Path of the input directory that contains the files to be packaged\n\
\ (absolute path or relative to the current directory)\n\
+\ All files in the input directory will be packaged into the\n\
+\ application image.\n\
\n\
\Options for creating the application launcher(s):\n\
\ --add-launcher <file path>\n\
@@ -129,7 +128,10 @@
\ "main-jar", "main-class", "arguments", "java-options",\n\
\ "app-version", "icon", and "win-console" can be used.\n\
\ These options are added to, or used to overwrite, the original\n\
-\ command line options when building an additional launcher.\n\
+\ command line options to build an additional alternative launcher.\n\
+\ The main application launcher will be built from the command line\n\
+\ options. Additional alternative launchers may be built using\n\
+\ this option.\n\
\ --arguments <main class arguments>\n\
\ Command line arguments to pass to the main class if no command\n\
\ line arguments are given to the launcher\n\
@@ -155,7 +157,7 @@
\ Location of the predefined application image that is used\n\
\ to build an installable package\n\
\ (absolute path or relative to the current directory)\n\
-\ See the create-image mode options to create the application image.\n\
+\ See create-app-image mode options to create the application image.\n\
\ --file-associations <file path>\n\
\ Path to a Properties file that contains list of key, value pairs\n\
\ (absolute path or relative to the current directory)\n\
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties Wed Apr 03 15:43:25 2019 -0700
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties Fri Apr 05 10:55:51 2019 -0400
@@ -27,7 +27,7 @@
MSG_Help=Usage: jpackage <mode> <options>\n\
\n\
where mode is one of: \n\
-\ create-image\n\
+\ create-app-image\n\
\ Generates a platform-specific application image.\n\
\ create-installer\n\
\ Generates a platform-specific installer for the application.\n\
@@ -35,19 +35,19 @@
Sample usages:\n\
--------------\n\
\ Generate a modular application image:\n\
-\ jpackage create-image -o outputdir -n name \\\n\
-\ -m moduleName/className -p modulePath\n\
+\ jpackage create-app-image -o outputdir -n name \\\n\
+\ -p modulePath -m moduleName/className\n\
\ To provide your own options to jlink, run jlink separately:\n\
-\ jlink --output app.runtime -m moduleName -p modulePath \\\n\
+\ jlink --output appRuntimeImage -p ModulePath -m moduleName\\\n\
\ --no-header-files [<additional jlink options>...]\n\
-\ jpackage -o outputdir -n name -m moduleName/className \\\n\
-\ --runtime-image app-runtime\n\
+\ jpackage create-app-image -o outputdir -n name\\\n\
+\ -m moduleName/className --runtime-image appRuntimeIMage\n\
\ Generate a non-modular application image:\n\
-\ jpackage create-image -o outputdir -i inputdir -n name \\\n\
+\ jpackage create-app-image -o outputdir -i inputdir -n name \\\n\
\ --main-class className --main-jar MyJar.jar\n\
\ Generate an application installer:\n\
\ jpackage create-installer -o outputdir -n name \\\n\
-\ -m moduleName/className -p modulePath\n\
+\ -p modulePath -m moduleName/className\n\
\ jpackage create-installer -i inputdir -o outputdir -n name \\\n\
\ --main-class package.ClassName --main-jar MyJar.jar\n\
\ jpackage create-installer -o outputdir -n <installer-name> \\\n\
@@ -111,15 +111,14 @@
\ --add-modules is not specified.\n\
\n\
\Options for creating the application image:\n\
-\ --files -f <input file>[{0}<input file>...]\n\
-\ A {0} separated list of files in the input dir to be packaged\n\
-\ If omitted, all files in the input directory will be packaged.\n\
\ --icon <icon file path>\n\
\ Path of the icon of the application bundle\n\
\ (absolute path or relative to the current directory)\n\
\ --input -i <input path>\n\
\ Path of the input directory that contains the files to be packaged\n\
\ (absolute path or relative to the current directory)\n\
+\ All files in the input directory will be packaged into the\n\
+\ application image.\n\
\n\
\Options for creating the application launcher(s):\n\
\ --add-launcher <file path>\n\
@@ -129,7 +128,10 @@
\ "main-jar", "main-class", "arguments", "java-options",\n\
\ "app-version", "icon", and "win-console" can be used.\n\
\ These options are added to, or used to overwrite, the original\n\
-\ command line options when building an additional launcher.\n\
+\ command line options to build an additional alternative launcher.\n\
+\ The main application launcher will be built from the command line\n\
+\ options. Additional alternative launchers may be built using\n\
+\ this option.\n\
\ --arguments <main class arguments>\n\
\ Command line arguments to pass to the main class if no command\n\
\ line arguments are given to the launcher\n\
@@ -155,7 +157,7 @@
\ Location of the predefined application image that is used\n\
\ to build an installable package\n\
\ (absolute path or relative to the current directory)\n\
-\ See the create-image mode options to create the application image.\n\
+\ See create-app-image mode options to create the application image.\n\
\ --file-associations <file path>\n\
\ Path to a Properties file that contains list of key, value pairs\n\
\ (absolute path or relative to the current directory)\n\