./build.gradle

rev 9664 : 8153539: JavaFX build script checking order for jfxrt.jar is non-deterministic
Reviewed-by:

*** 1262,1271 ****
--- 1262,1274 ----
          if (BUILD_CLOSED && DO_JCOV)  {
              testCompile name: "jcov"
          }
      }
  
+     compileJava.dependsOn verifyJava
+     compileJava.dependsOn checkJfxrtJar
+ 
      // Compile and run tests against the jfxrt.jar in the built sdk of the host machine
      def sdkDir = "${rootProject.buildDir}/sdk"
      def jfxrtJar = "$sdkDir/lib/jfxrt.jar"
      def testJfxrtJar = DO_BUILD_SDK_FOR_TEST ? jfxrtJar : jfxrtJarFromSdk
  
*** 1367,1379 ****
              }
              line
          }
      }
  
-     compileJava.dependsOn updateCacheIfNeeded
-     compileJava.dependsOn verifyJava
- 
      // Make sure to include $buildDir/generated-src/version-info that we previously created.
      // We DO NOT want to include src/main/version-info
      if (System.getProperty("jfx.build.jdk.defenders", "true").equals("true")) {
          sourceSets.main.java.srcDirs += "src/main/java8"
      } else {
--- 1370,1379 ----
*** 2311,2320 ****
--- 2311,2322 ----
  
      dependencies {
          compile BUILD_SRC, project(":base"), project(":graphics")
      }
  
+     compileJava.dependsOn updateCacheIfNeeded
+ 
      sourceSets {
          tools {
              java.srcDir "src/tools/java"
          }
      }
*** 2621,2630 ****
--- 2623,2634 ----
  
      dependencies {
          compile project(":base"), project(":graphics"), project(":controls"), project(":media")
      }
  
+     compileJava.dependsOn updateCacheIfNeeded
+ 
      test {
          if (!IS_JIGSAW_TEST) {
          //TODO: support this in Jake
          // Run web tests in headless mode
          systemProperty 'glass.platform', 'Monocle'
*** 3029,3040 ****
          }
      }
  }
  
  task sdk() {
-     dependsOn(checkJfxrtJar)
- 
      if (DO_BUILD_SDK_FOR_TEST) {
          rootProject.getTasksByName("test", true).each { t ->
              if (t.enabled) t.dependsOn(sdk)
          }
      }
--- 3033,3042 ----