Update Windows build to include javafx

installers/windows/zip/build.gradle

@@ -18,8 +18,12 @@
 * 2 along with this work; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 */
+configurations {
+    javafx
+}
 
 dependencies {
+    javafx project(path: ':javafx', configuration: 'archives')
     compile project(path: ':openjdksrc', configuration: 'archives')
 }
 
@@ -29,6 +33,17 @@ task copySource(type: Copy) {
     into buildRoot
 }
 
+task createJavafxOverlay(type: Copy) {
+    dependsOn project.configurations.javafx
+    from tarTree(project.configurations.javafx.singleFile)
+    into "$buildDir/javafx"
+    eachFile {
+        if (it.path.startsWith('rt/')) {
+            it.path = it.path.replace('rt/', 'jre/')
+        }
+    }
+}
+
 task configureBuild(type: Exec) {
     dependsOn copySource
     workingDir "$buildRoot"
@@ -70,6 +85,7 @@ task copyCacerts(type: Copy) {
 
 task copyImage() {
     dependsOn copyCacerts
+    dependsOn createJavafxOverlay
 
     doLast {
         // Copy image
@@ -91,6 +107,11 @@ task copyImage() {
             include "version.txt"
             into "$buildRoot/build/j2re-image"
         }
+
+        exec {
+            workingDir createJavafxOverlay.destinationDir
+            commandLine 'cp', '-Rf', '--parents', 'bin', 'jre', 'lib', 'man/man1', 'javafx-src.zip', "$buildRoot/build/j2re-image"
+        }
     }
 }