src/jdk.packager/macosx/classes/jdk/packager/internal/builders/mac/MacAppImageBuilder.java
branchJDK-8200758-branch
changeset 56948 60e53f98dac0
parent 56933 9f59eeb3cc0f
child 56982 e094d5483bd6
equal deleted inserted replaced
56947:5a03c4524b90 56948:60e53f98dac0
   455                 runtimeDir.resolve("Contents/Info.plist").toFile());
   455                 runtimeDir.resolve("Contents/Info.plist").toFile());
   456 
   456 
   457         // copy library
   457         // copy library
   458         Path runtimeMacOSDir = Files.createDirectories(
   458         Path runtimeMacOSDir = Files.createDirectories(
   459                 runtimeDir.resolve("Contents/MacOS"));
   459                 runtimeDir.resolve("Contents/MacOS"));
   460         Files.copy(runtimeRoot.resolve("lib/jli/libjli.dylib"),
   460 
   461                 runtimeMacOSDir.resolve("libjli.dylib"));
   461         // JDK 9, 10, and 11 have extra '/jli/' subdir
       
   462         Path jli = runtimeRoot.resolve("lib/libjli.dylib");
       
   463         if (!Files.exists(jli)) {
       
   464             jli = runtimeRoot.resolve("lib/jli/libjli.dylib");
       
   465         }
       
   466 
       
   467         Files.copy(jli, runtimeMacOSDir.resolve("libjli.dylib"));
   462     }
   468     }
   463 
   469 
   464     private void sign() throws IOException {
   470     private void sign() throws IOException {
   465         if (Optional.ofNullable(
   471         if (Optional.ofNullable(
   466                 SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.TRUE)) {
   472                 SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.TRUE)) {