unpack JDK build script: strip excessive directories for Mac

2026-09-27 10:03:11 +07:00 · 2016-04-29 11:35:40 +03:00
parent ed8ede7b8a
commit 3803b5e4c4
1 changed files with 9 additions and 0 deletions
@@ -77,6 +77,15 @@ private void unpackJdk(File osDir, File jdkDir, String archiveFileNamePrefix, St
        arg(value: "--directory")
        arg(value: destDir)
      }
+      def jdkContents = new File(destDir, "jdk/Contents")
+      if (SystemInfo.isMac && jdkContents.exists()) {
+        jdkContents.listFiles().each { file ->
+          ant.exec(executable: "mv", dir: destDir) {
+            arg(value: file.absolutePath)
+            arg(value: destDir)
+          }
+        }
+      }
    }
  }
  else {