> 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 with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains two additional commits since the last revision: - Merge remote-tracking branch 'upstream/master' into JDK-8351073-2 - 8351073: [macos] jpackage produces invalid Java runtime DMG bundles ------------- Changes: - all: https://git.openjdk.org/jdk/pull/26173/files - new: https://git.openjdk.org/jdk/pull/26173/files/d880fcf7..72a1e3a9 Webrevs: - full: https://webrevs.openjdk.org/?repo=jdk&pr=26173&range=01 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=26173&range=00-01 Stats: 28484 lines in 1050 files changed: 13783 ins; 9199 del; 5502 mod Patch: https://git.openjdk.org/jdk/pull/26173.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/26173/head:pull/26173 PR: https://git.openjdk.org/jdk/pull/26173
