Skip to content

8364564: Shortcut configuration is not recorded in .jpackage.xml file #26604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Aug 2, 2025

  • Add LauncherShortcut and LauncherShortcutStartupDirectory types to the model to define launcher shortcuts. For now LauncherShortcutStartupDirectory enum has a single value. It will be extended in JDK-8308349 enhancement.
  • Replace WinLauncherMixin.shortcuts() with WinLauncherMixin.startMenuShortcut() and WinLauncherMixin.desktopShortcut().
  • Remove redundant StandardBundlerParam.SHORTCUT_HINT and StandardBundlerParam.MENU_HINT; use "win-shortcut", "win-menu", and "linux-shortcut" values instead of "shortcut" and "menu" to store launcher shortcut configuration in the ".jpackage.xml" file.
  • Add tests for launcher shortcut configuration in the ".jpackage.xml" file.

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8364564: Shortcut configuration is not recorded in .jpackage.xml file (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26604/head:pull/26604
$ git checkout pull/26604

Update a local copy of the PR:
$ git checkout pull/26604
$ git pull https://git.openjdk.org/jdk.git pull/26604/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26604

View PR using the GUI difftool:
$ git pr show -t 26604

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26604.diff

Using Webrev

Link to Webrev Comment

…I bundles. With this patch, there is no longer a need to install an MSI package to verify shortcuts.
… verify the contents of an icon file or just verify the icon file's availability.
…: follow-up for function renames in the AdditionalLauncher.
…ditionalLauncher. Introduce LauncherShortcut, LauncherVerifier, LauncherVerifier verifies attributes of any launcher - the main or additional. Add JPackageCommand.createMutableCopy(), hide the copy ctor.
…installed in the system folder on package install and uninstalled on package uninstall. Always verify contents of .desktop files.
…ations of startup directory in the main launcher and in the additional launcher; add testInvokeShortcuts() to invoke launchers through shortcuts and verify work directory; cover shortcuts in the predefined app image
@openjdk
Copy link

openjdk bot commented Aug 7, 2025

⚠️ @alexeysemenyukoracle This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@alexeysemenyukoracle alexeysemenyukoracle marked this pull request as ready for review August 7, 2025 15:47
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 7, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 7, 2025

Webrevs

@alexeysemenyukoracle
Copy link
Member Author

@sashamatveev PTAL

Copy link
Member

@sashamatveev sashamatveev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 8, 2025
@alexeysemenyukoracle
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 8, 2025

Going to push as commit 8ad1fcc.
Since your change was applied there have been 21 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 8, 2025
@openjdk openjdk bot closed this Aug 8, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 8, 2025
@openjdk
Copy link

openjdk bot commented Aug 8, 2025

@alexeysemenyukoracle Pushed as commit 8ad1fcc.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants