./build.gradle

rev 10173 : 8170485: Switch to building JavaFX with new module-info syntax
Reviewed-by:

*** 3852,3892 ****
              moduleProjList.each { project ->
                  def policyDir = "${project.projectDir}/src/main/conf/security"
                  def policyFile = file("${policyDir}/java.policy")
                  if (policyFile.exists()) outputPolicyFile << policyFile.text
              }
- 
-             // ----------------------------------------------
-             // FIXME: Begin temporary jake support
-             // ----------------------------------------------
- 
-             // Copy modules_src into modules_src_jake, replacing
-             // module-info.java with a jake-compatible version
- 
-             def modulesSrcJakeDir = "${modularSdkDir}/modules_src_jake"
-             copy {
-                 from modulesSrcDir
-                 into modulesSrcJakeDir
-             }
- 
-             moduleProjList.each { project ->
-                 def moduleName = project.ext.moduleName
-                 def dstModulesSrcJakeDir = "${modulesSrcJakeDir}/${moduleName}"
- 
-                 // Copy src/main/jake/module-info.java to modules_src_jake
-                 def srcJakeModuleInfoFile = "${project.projectDir}/src/main/jake/module-info.java"
-                 copy {
-                     from srcJakeModuleInfoFile
-                     into dstModulesSrcJakeDir
-                     if (project.hasProperty("sourceFilter")) {
-                         filter(project.sourceFilter)
-                     }
-                 }
-             }
-             // ----------------------------------------------
-             // FIXME: End temporary jake support
-             // ----------------------------------------------
          }
      }
      zipTask.dependsOn(buildModulesTask);
      buildModules.dependsOn(buildModulesTask)
  
--- 3852,3861 ----