changeset 9240:2ee6be132c1b

8134725: Gradle openZip task does not support JDK9 layout Reviewed-by: ddhill
author kcr
date Thu, 03 Sep 2015 08:57:11 -0700
parents 59e8512b0e83
children e336fd3d9c5f
files build.gradle
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Wed Sep 02 23:36:50 2015 +0300
+++ b/build.gradle	Thu Sep 03 08:57:11 2015 -0700
@@ -3305,6 +3305,7 @@
             copy {
                 from "${sdkDir}"
                 into "${exportSDKDir}"
+                includeEmptyDirs = false
                 exclude '**/jfxrt.jar'
 
                 if (isWindows) {
@@ -3313,7 +3314,7 @@
 
                 eachFile {details ->
                     if (details.path.startsWith('rt/')) {
-                        details.path = 'jre/' + details.path.substring(3);
+                        details.path = "./" + details.path.substring(3);
                     }
                 }
             }
@@ -3323,10 +3324,10 @@
                 into "${exportTmp}"
             }
 
-            mkdir "${exportSDKDir}/jre/lib/ext"
+            mkdir "${exportSDKDir}/lib"
 
             ant.jar(
-                    destfile: "${exportSDKDir}/jre/lib/ext/jfxrt.jar",
+                    destfile: "${exportSDKDir}/lib/jfxrt.jar",
                     index: true,
                     compress: compressJar
                 ) {