From ceb109fbd8a382b8c8afa73bdeffc360d352d935 Mon Sep 17 00:00:00 2001 From: Alexey Semenyuk Date: Thu, 26 Mar 2026 01:59:10 +0000 Subject: [PATCH] 8380081: jpackage: Incorrect descriptions of win-specific options Reviewed-by: nlisker, almatvee --- .../internal/resources/HelpResources.properties | 14 +++++++++----- src/jdk.jpackage/share/man/jpackage.md | 11 +++++++---- .../jdk/jpackage/internal/cli/help-windows.txt | 14 +++++++++----- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties index 0b2ca83a7d7..7f570e71330 100644 --- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties @@ -405,20 +405,24 @@ help.option.win-help-url=\ \ URL where user can obtain further information or technical support help.option.win-menu=\ -\ Request to add a Start menu shortcut for this application +\ Adds a Start menu shortcut for this application, or requests\n\ +\ to do so if --win-shortcut-prompt is specified help.option.win-menu-group=\ \ Start Menu group this application is placed in help.option.win-per-user-install=\ -\ Request to perform an install on a per-user basis +\ Installs the application on a per-user basis.\n\ +\ Without this option installs per-machine help.option.win-shortcut=\ -\ Request to add desktop shortcut for this application +\ Adds a desktop shortcut for this application, or requests\n\ +\ to do so if --win-shortcut-prompt is specified help.option.win-shortcut-prompt=\ -\ Adds a dialog to enable the user to choose if shortcuts\n\ -\ will be created by installer. +\ Adds a dialog if at least one of --win-menu or --win-shortcut\n\ +\ are specified to enable the user to choose if these shortcuts\n\ +\ will be created by the installer help.option.win-update-url=\ \ URL of available application update information diff --git a/src/jdk.jpackage/share/man/jpackage.md b/src/jdk.jpackage/share/man/jpackage.md index 9ba5949866f..156b05307b7 100644 --- a/src/jdk.jpackage/share/man/jpackage.md +++ b/src/jdk.jpackage/share/man/jpackage.md @@ -410,7 +410,8 @@ The `jpackage` tool will take as input a Java application and a Java run-time im `--win-menu` -: Request to add a Start Menu shortcut for this application +: Adds a Start menu shortcut for this application, or requests to do so + if --win-shortcut-prompt is specified `--win-menu-group` *menu-group-name* @@ -418,15 +419,17 @@ The `jpackage` tool will take as input a Java application and a Java run-time im `--win-per-user-install` -: Request to perform an install on a per-user basis +: Installs the application on a per-user basis. Without this option installs per-machine `--win-shortcut` -: Request to create a desktop shortcut for this application +: Adds a desktop shortcut for this application, or requests to do so + if --win-shortcut-prompt is specified `--win-shortcut-prompt` -: Adds a dialog to enable the user to choose if shortcuts will be created by installer +: Adds a dialog if at least one of --win-menu or --win-shortcut are specified + to enable the user to choose if these shortcuts will be created by the installer `--win-update-url` *url* diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt index 7a098b847ad..e30a5bb7f9b 100644 --- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt +++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt @@ -189,16 +189,20 @@ Platform dependent options for creating the application package: --win-help-url URL where user can obtain further information or technical support --win-menu [] - Request to add a Start menu shortcut for this application + Adds a Start menu shortcut for this application, or requests + to do so if --win-shortcut-prompt is specified --win-menu-group Start Menu group this application is placed in --win-per-user-install - Request to perform an install on a per-user basis + Installs the application on a per-user basis. + Without this option installs per-machine --win-shortcut [] - Request to add desktop shortcut for this application + Adds a desktop shortcut for this application, or requests + to do so if --win-shortcut-prompt is specified --win-shortcut-prompt - Adds a dialog to enable the user to choose if shortcuts - will be created by installer. + Adds a dialog if at least one of --win-menu or --win-shortcut + are specified to enable the user to choose if these shortcuts + will be created by the installer --win-update-url URL of available application update information --win-upgrade-uuid