RFR: 8351073: [macos] jpackage produces invalid Java runtime DMG bundles [v4]
Alexey Semenyuk
asemenyuk at openjdk.org
Mon Jul 14 23:32:47 UTC 2025
On Fri, 11 Jul 2025 16:44:05 GMT, Alexander Matveev <almatvee at openjdk.org> wrote:
>> Re-submission of https://github.com/openjdk/jdk/pull/25314 after merge conflict was resolved. Old PR will be closed.
>>
>> All comments are addressed from old PR. Merge conflict was significant, so it is like new fix.
>>
>> Fixed jpackage to produce valid Java runtimes based on description below:
>>
>> Definitions:
>>
>> - JDK bundle defined as bundle which contains "Contents/Home", "Contents/MacOS/libjli.dylib" and "Contents/Info.plist".
>> - Signed JDK bundle contains all files as JDK bundle + "Contents/_CodeSignature".
>> - JDK image defined as content of "Contents/Home".
>> - Signed JDK image does not exist, since it cannot be signed as bundle.
>>
>> jpackage output based on input:
>>
>> 1. "--runtime-image" points to unsigned JDK bundle and --mac-sign is not provided:
>> - jpackage will copy all files as is from provided path and run ad-hoc codesign.
>>
>> 2. "--runtime-image" points to unsigned JDK bundle and --mac-sign is provided:
>> - jpackage will copy all files as is from provided path and run codesign with appropriate certificate based on same logic as we do for application image.
>>
>> 3. "--runtime-image" points to signed JDK bundle and --mac-sign is not provided:
>> - jpackage will copy all files as is from provided path including "Contents/_CodeSignature" to preserve signing.
>>
>> 4. "--runtime-image" points to signed JDK bundle and --mac-sign is provided:
>> - jpackage will copy all files as is from provided path including "Contents/_CodeSignature" and will re-sign bundle with appropriate certificate.
>>
>> 5. "--runtime-image" points to JDK image and --mac-sign is not provided:
>> - jpackage will check for libjli.dylib presence in "lib" folder.
>> - Create JDK bundle by putting all files from provided path to "Contents/Home", libjli.dylib from "lib" to "Contents/MacOS/libjli.dylib" and create default "Contents/Info.plist" similar to what we do for runtime in application image.
>> - Ad-hoc signing will done.
>>
>> 6. "--runtime-image" points to JDK image and --mac-sign is provided:
>> - 2 first steps from 5 and certificate signing will be done.
>>
>> Additional changes:
>> - The bundle's top directory name will have the ".jdk" suffix.
>
> Alexander Matveev has updated the pull request incrementally with one additional commit since the last revision:
>
> 8351073: [macos] jpackage produces invalid Java runtime DMG bundles [v3]
src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java line 223:
> 221: && path1.toFile().list().length > 0
> 222: && IOUtils.exists(path2)
> 223: && IOUtils.exists(path3);
Please don't use `IOUtils.exists()` and other redundant wrappers over the `Files` class in the new code. Use `Files.exists()` instead.
src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java line 238:
> 236: return false;
> 237: } catch (IOException ex) {
> 238: throw new RuntimeException(ex);
Should be either
ExceptionBox.rethrowUnchecked(ex);
or
throw new UncheckedIOException(ex);
-------------
PR Review Comment: https://git.openjdk.org/jdk/pull/26173#discussion_r2205986042
PR Review Comment: https://git.openjdk.org/jdk/pull/26173#discussion_r2205987403
More information about the core-libs-dev
mailing list