8356218: [macos] Document --app-content #26848

sashamatveev · 2025-08-19T20:07:10Z

Added following note for --app-content on macOS to help and man page: The value should be a directory with the "Resources" subdirectory (or any other directory that is valid in the "Contents" directory of the application bundle). Otherwise, jpackage may produce invalid application bundle which may fail code signing and/or notarization.
Added warning if --app-content if it points to non-standard subdirectory in "Contents" directory.
Added test to cover warning message.

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-8356218: [macos] Document --app-content (Enhancement - P3)

Reviewers

Alexey Semenyuk (@alexeysemenyukoracle - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26848

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-08-19T20:08:14Z

👋 Welcome back almatvee! 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-19T20:08:21Z

@sashamatveev 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:

8356218: [macos] Document --app-content

Reviewed-by: asemenyuk

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 71 new commits pushed to the master branch:

2e06a91: 8365841: RISC-V: Several IR verification tests fail after JDK-8350960 without Zvfh
ecab52c: 8365610: Sort share/jfr includes
ed7d5fe: 8360304: Redundant condition in LibraryCallKit::inline_vector_nary_operation
... and 68 more: https://git.openjdk.org/jdk/compare/a65f20022080e627da4782b9b643912a9dd69335...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-19T20:09:36Z

@sashamatveev 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-19T20:13:10Z

Webrevs

alexeysemenyukoracle · 2025-08-19T21:03:37Z

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java

+            if (!CONTENTS_SUB_DIRS.stream()
+                    .anyMatch(subDir -> contentDir.getFileName().toString()
+                                                  .equalsIgnoreCase(subDir))) {
+                Log.info(MessageFormat.format(I18N.getString(


Can be simplified down to:

Log.info(I18N.format("warning.non.standard.contents.sub.dir", contentDir));

Fixed. I copy-paste this code. We have many places with MessageFormat.format(I18N.getString()). Should I file follow up bug to clean-up it?

Up to you. I think it is sufficient merely not add new MessageFormat.format() calls and use I18N.format() instead.

alexeysemenyukoracle · 2025-08-19T21:05:53Z

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties

@@ -85,3 +85,4 @@ message.codesign.failed.reason.app.content="codesign" failed and additional appl
 message.codesign.failed.reason.xcode.tools=Possible reason for "codesign" failure is missing Xcode with command line developer tools. Install Xcode with command line developer tools to see if it resolves the problem.
 warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {0}.
 warning.per.user.app.image.signed=Warning: Support for per-user configuration of the installed application will not be supported due to missing "{0}" in predefined signed application image.
+warning.non.standard.contents.sub.dir=Warning: --app-content value "{0}" points to the non-standard subdirectory in the "Contents" directory of the application bundle.


This warning is not particularly helpful:

It doesn't provide details;

It is misleading. The value of the --app-content cli option specifies directories and files that will be copied into the application bundle, not those in the bundle.

I'd issue a warning for every unexpected directory/file found in the value of the --app-content option.

I suggest we have two warning messages:

Warning: The file name of the directory "{0}" specified for the --app-content option is not a standard subdirectory name in the "Contents" directory of the application bundle. The result application bundle may fail notarization.

Warning: The value "{0}" of the --app-content option is not a directory. The result application bundle may fail notarization.

Updated as suggested.

alexeysemenyukoracle · 2025-08-19T21:17:37Z

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java

+        for (var contentDir : app.contentDirs()) {
+            if (!CONTENTS_SUB_DIRS.stream()
+                    .anyMatch(subDir -> contentDir.getFileName().toString()
+                                                  .equalsIgnoreCase(subDir))) {


Why case-insensitive path name comparison on Unix?

By default macOS is case-insensitive. If I rename MacOS to macos in application bundle, such bundle will still works. I assumed that Resources and resources are same thing. After thinking more about it I think it should be case sensitive comparison. Will change it.

Changed to case sensitive comparison.

fandreuz · 2025-08-20T01:19:16Z

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java

@@ -123,6 +125,17 @@ private static void validateAppVersion(Application app) throws ConfigException {
        }
    }

+    private static void validateAppContentDirs(Application app) {
+        for (var contentDir : app.contentDirs()) {
+            if (!CONTENTS_SUB_DIRS.stream()


You could replace CONTENTS_SUB_DIRS with a Set<String>, and the inspection with CONTENTS_SUB_DIRS.contains(contentDir.getFileName().toString()).

Updated as suggested.

sashamatveev · 2025-08-21T00:12:10Z

8356218: [macos] Document --app-content [v3]

Fixed latest review comments.
Test moved from ErrorTest to AppContentTest.
Added setIgnoreExitCode() to JPackageCommand to ignore exit code. Added test case may or may not fail depending on macOS version.

alexeysemenyukoracle · 2025-08-21T00:19:49Z

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java

+    public JPackageCommand setIgnoreExitCode(boolean v) {
+        ignoreExitCode = v;
+        return this;
+    }


This is bad. It makes unclear semantics of the JPackageCommand.execute(int expectedExitCode) function.

I suggest adding JPackageCommand.executeIgnoreExitCode() function instead in the following way:

public Executor.Result executeIgnoreExitCode() { return execute(Optional.empty()); } public Executor.Result execute(int expectedExitCode) { return execute(Optional.of(expectedExitCode)); } private Executor.Result execute(Optional expectedExitCode) { // Here goes the implementation of the current execute(int expectedExitCode) function adjusted accordingly }

alexeysemenyukoracle · 2025-08-21T00:22:10Z

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

+    @Test(ifOS = MACOS)
+    @Parameter({TEST_DIR, "warning.non.standard.contents.sub.dir"})
+    @Parameter({TEST_DUKE, "warning.app.content.is.not.dir"})
+    public void testWarnings(String... args) throws Exception {


String... args -> String testPath, String warningId

sashamatveev · 2025-08-21T02:34:21Z

8356218: [macos] Document --app-content [v4]

Fixed latest comments.

8356218: [macos] Document --app-content

803787f

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

alexeysemenyukoracle reviewed Aug 19, 2025

View reviewed changes

8356218: [macos] Document --app-content [v2]

18d37f6

fandreuz reviewed Aug 20, 2025

View reviewed changes

8356218: [macos] Document --app-content [v3]

44d8982

alexeysemenyukoracle reviewed Aug 21, 2025

View reviewed changes

8356218: [macos] Document --app-content [v4]

5e109dc

alexeysemenyukoracle approved these changes Aug 21, 2025

View reviewed changes

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

8356218: [macos] Document --app-content #26848

Are you sure you want to change the base?

8356218: [macos] Document --app-content #26848

Conversation

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

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Aug 19, 2025

Uh oh!

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

Uh oh!

Uh oh!

openjdk bot commented Aug 19, 2025

Uh oh!

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

Uh oh!

Webrevs

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexeysemenyukoracle Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sashamatveev commented Aug 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sashamatveev commented Aug 21, 2025

Uh oh!

Uh oh!

sashamatveev commented Aug 19, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Aug 19, 2025 •

edited

Loading

mlbridge bot commented Aug 19, 2025 •

edited

Loading

alexeysemenyukoracle Aug 19, 2025 •

edited

Loading