8308349: missing working directory option for launcher when invoked from shortcuts #26707

alexeysemenyukoracle · 2025-08-08T22:37:21Z

Support a new "app-dir" value of win-shortcut, win-menu, and linux-shortcut properties in additional launcher property files.
Support an optional value of --win-shortcut, --win-menu, and --linux-shortcut CLI options. The valid value is "app-dir".

If a value of any property/CLI option from the above list is set to "app-dir", the startup directory of the corresponding shortcut will be set to the "app" subdirectory of the installation directory.

If a CLI option from the above list doesn't have a value, the startup directory of the corresponding shortcut for the main launcher will be set to the installation directory on Windows and will not be set on Linux. This is the existing behavior; it has not changed.

If a value of a property from the above list evaluates to true, the startup directory of the corresponding shortcut for the additional launcher will be set to the installation directory on Windows and will not be set on Linux. This is the existing behavior; it has not changed.

Added test cases to AddLShortcut test implicitly.

Reworked one of the additional launchers in AddLShortcut.test() to allow verification of the working directory when the launcher is invoked through the shortcut in manual tests.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Change requires CSR request JDK-8364656 to be approved
Commit message must refer to an issue

Warning

⚠️ Found leading lowercase letter in issue title for 8308349: missing working directory option for launcher when invoked from shortcuts

Issues

JDK-8308349: missing working directory option for launcher when invoked from shortcuts (Enhancement - P4)
JDK-8364656: missing working directory option for launcher when invoked from shortcuts (CSR)

Reviewers

Alexander Matveev (@sashamatveev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26707

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…rom shortcuts

…R and jdk.jpackage.internal.model.LauncherShortcutStartupDirectory.INSTALL_DIR

bridgekeeper · 2025-08-08T22:38:27Z

👋 Welcome back asemenyuk! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2025-08-08T22:39:28Z

@alexeysemenyukoracle This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8308349: missing working directory option for launcher when invoked from shortcuts

Reviewed-by: almatvee

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 21 new commits pushed to the master branch:

6927fc3: 8365200: RISC-V: compiler/loopopts/superword/TestGeneralizedReductions.java fails with Zvbb and vlen=128
9593730: 8362376: Use @stable annotation in Java FDLIBM implementation
8cd7975: 8364761: (aio) AsynchronousChannelGroup.execute doesn't check null command
... and 18 more: https://git.openjdk.org/jdk/compare/8ad1fcc48a4ba49ffde6dfbb851dbb3f56077dec...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2025-08-08T22:40:25Z

@alexeysemenyukoracle The following label will be automatically applied to this pull request:

core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2025-08-08T22:59:37Z

Webrevs

sashamatveev · 2025-08-08T23:23:02Z

src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java

        private static boolean hasNextArg() {
            return context().pos < context().argList.size();
        }
+
+        private static Runnable createArgumentWithOptionalValueAction(String option) {


I am not sure, but did you test case when --win-menu or --win-shortcut or --linux-shortcut is last argument without value? With new code var value = popArg(); will be "" and we will call setOptionValue(option, value). Before change it will be set to true.

You are right. I reworked the tests, and they start failing if the last argument is --win-menu, --win-shortcut, or --linux-shortcut.

sashamatveev

Looks good.

…ch one of the additional launchers is started when invoked through a shortcut.

alexeysemenyukoracle · 2025-08-12T00:52:51Z

@sashamatveev, please review again. This is the final iteration.

sashamatveev · 2025-08-12T01:01:08Z

test/jdk/tools/jpackage/share/AddLShortcutTest.java

@@ -85,14 +92,16 @@

 public class AddLShortcutTest {

-    @Test
+    @Test(ifNotOS = OperatingSystem.MACOS)


Do we really need both (ifNotOS = OperatingSystem.MACOS) and (os.family != "mac")?

The one is for jtreg, and the other is for the jpackage test runner. The latter makes sense when the test is executed outside of jtreg.

sashamatveev

Latest changes looks good.

alexeysemenyukoracle · 2025-08-12T03:15:11Z

/integrate

openjdk · 2025-08-12T03:15:51Z

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

6927fc3: 8365200: RISC-V: compiler/loopopts/superword/TestGeneralizedReductions.java fails with Zvbb and vlen=128
9593730: 8362376: Use @stable annotation in Java FDLIBM implementation
8cd7975: 8364761: (aio) AsynchronousChannelGroup.execute doesn't check null command
... and 18 more: https://git.openjdk.org/jdk/compare/8ad1fcc48a4ba49ffde6dfbb851dbb3f56077dec...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-08-12T03:16:10Z

@alexeysemenyukoracle Pushed as commit 72d3a2a.

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

alexeysemenyukoracle added 4 commits August 8, 2025 18:24

8308349: missing working directory option for launcher when invoked f…

53d2302

…rom shortcuts

Adjust tests for JDK-8308349

8f5408f

Add ParseUtils to the model.

75fed1d

Remove jdk.jpackage.test.LauncherShortcut.StartupDirectory.INSTALL_DI…

40c1dc8

…R and jdk.jpackage.internal.model.LauncherShortcutStartupDirectory.INSTALL_DIR

openjdk bot added core-libs [email protected] rfr Pull request is ready for review labels Aug 8, 2025

Fix javadoc

9f5da71

sashamatveev reviewed Aug 8, 2025

View reviewed changes

Arguments, LinuxHelper: bugfix; AddLShortcutTest: better test coverage

42922ec

sashamatveev approved these changes Aug 11, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 11, 2025

alexeysemenyukoracle added 2 commits August 11, 2025 20:38

Rework AddLShortcutTest.test() to verify the working directory in whi…

2d69154

…ch one of the additional launchers is started when invoked through a shortcut.

Blessed modifiers order

557c243

openjdk bot removed the ready Pull request is ready to be integrated label Aug 12, 2025

sashamatveev reviewed Aug 12, 2025

View reviewed changes

sashamatveev approved these changes Aug 12, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 12, 2025

openjdk bot added the integrated Pull request has been integrated label Aug 12, 2025

openjdk bot closed this Aug 12, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 12, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8308349: missing working directory option for launcher when invoked from shortcuts #26707

8308349: missing working directory option for launcher when invoked from shortcuts #26707

Uh oh!

alexeysemenyukoracle commented Aug 8, 2025 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Aug 8, 2025

Uh oh!

openjdk bot commented Aug 8, 2025 •

edited

Loading

Uh oh!

openjdk bot commented Aug 8, 2025

Uh oh!

mlbridge bot commented Aug 8, 2025 •

edited

Loading

Uh oh!

sashamatveev Aug 8, 2025

Uh oh!

alexeysemenyukoracle Aug 11, 2025

Uh oh!

sashamatveev left a comment

Uh oh!

alexeysemenyukoracle commented Aug 12, 2025

Uh oh!

sashamatveev Aug 12, 2025

Uh oh!

alexeysemenyukoracle Aug 12, 2025

Uh oh!

sashamatveev left a comment

Uh oh!

alexeysemenyukoracle commented Aug 12, 2025

Uh oh!

openjdk bot commented Aug 12, 2025

Uh oh!

openjdk bot commented Aug 12, 2025

Uh oh!

Uh oh!

8308349: missing working directory option for launcher when invoked from shortcuts #26707

8308349: missing working directory option for launcher when invoked from shortcuts #26707

Uh oh!

Conversation

alexeysemenyukoracle commented Aug 8, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Warning

Issues

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Aug 8, 2025

Uh oh!

openjdk bot commented Aug 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Aug 8, 2025

Uh oh!

mlbridge bot commented Aug 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

sashamatveev Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

alexeysemenyukoracle Aug 11, 2025

Choose a reason for hiding this comment

Uh oh!

sashamatveev left a comment

Choose a reason for hiding this comment

Uh oh!

alexeysemenyukoracle commented Aug 12, 2025

Uh oh!

sashamatveev Aug 12, 2025

Choose a reason for hiding this comment

Uh oh!

alexeysemenyukoracle Aug 12, 2025

Choose a reason for hiding this comment

Uh oh!

sashamatveev left a comment

Choose a reason for hiding this comment

Uh oh!

alexeysemenyukoracle commented Aug 12, 2025

Uh oh!

openjdk bot commented Aug 12, 2025

Uh oh!

openjdk bot commented Aug 12, 2025

Uh oh!

Uh oh!

alexeysemenyukoracle commented Aug 8, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Aug 8, 2025 •

edited

Loading

mlbridge bot commented Aug 8, 2025 •

edited

Loading