./build.gradle

rev 10424 : 8090969: Remove lens implementation in Glass
Reviewed-by:

*** 593,603 ****
  
              if (!pkgdir.isDirectory()) {
                  rootProject.dependencies.add(fetchToolsConfig, "javafx:$basename:$ver", {
                      artifact {
                          name = basename
-                         version = ver
                          type = ext
                      }
                  })
                  println "adding $pkgname as a downloadable item did not find $pkgdir"
                  fetchedPackages.add(pkgname)
--- 593,602 ----
*** 704,714 ****
              commandLine "cmd", "/c", ant, "-Dbuild.compiler=javac1.7"
          } else {
              commandLine ant, "-Dbuild.compiler=javac1.7"
          }
          if ((conf != null) && !rootProject.defaultHostTarget.equals(conf)) {
!             def targetProperties = rootProject.ext[t.trim().toUpperCase()]
              args("-Dcross.platform=$conf")
              if (targetProperties.containsKey('arch')) {
                  args("-Dcross.platform.arch=${targetProperties.arch}")
              }
          }
--- 703,713 ----
              commandLine "cmd", "/c", ant, "-Dbuild.compiler=javac1.7"
          } else {
              commandLine ant, "-Dbuild.compiler=javac1.7"
          }
          if ((conf != null) && !rootProject.defaultHostTarget.equals(conf)) {
!             def targetProperties = rootProject.ext[conf.trim().toUpperCase()]
              args("-Dcross.platform=$conf")
              if (targetProperties.containsKey('arch')) {
                  args("-Dcross.platform.arch=${targetProperties.arch}")
              }
          }
*** 986,996 ****
      }
  
      if (!targetProperties.containsKey('includeSWT')) targetProperties.includeSWT = true
      if (!targetProperties.containsKey('includeSwing')) targetProperties.includeSwing = true
      if (!targetProperties.containsKey('includeNull3d')) targetProperties.includeNull3d = true
-     if (!targetProperties.containsKey('includeLens')) targetProperties.includeLens = false
      if (!targetProperties.containsKey('includeMonocle')) targetProperties.includeMonocle = false
      if (!targetProperties.containsKey('includeEGL')) targetProperties.includeEGL = false
  
      if (!targetProperties.containsKey('includeGTK')) targetProperties.includeGTK = IS_LINUX
  
--- 985,994 ----
*** 2542,2553 ****
--- 2540,2553 ----
              into "$buildDir/javapackager"
              fileMode = 0755
          }
      }
  
+     if (COMPILE_FXPACKAGER) {
          assemble.dependsOn compileLauncher;
          assemble.dependsOn buildJavaPackager
+     }
  
      classes << {
          // Copy all of the download libraries to libs directory for the sake of the IDEs
          File libsDir = rootProject.file("build/libs");
          File antLib = new File(libsDir, "ant-1.8.2.jar")
*** 4047,4060 ****
  
                  if (!targetProperties.includeEGL) {
                      exclude ("com/sun/prism/es2/EGL*")
                  }
  
-                 if (!targetProperties.includeLens) {
-                     exclude ("com/sun/glass/ui/lens")
-                 }
- 
                  if (!targetProperties.includeMonocle) {
                      exclude ("com/sun/glass/ui/monocle")
                      exclude("com/sun/prism/es2/Monocle*")
                  }
  
--- 4047,4056 ----
*** 4125,4134 ****
--- 4121,4135 ----
  
              def moduleLibDir = "${baseProject.buildDir}/${platformPrefix}module-lib"
              final File javafxProperties = file("${moduleLibDir}/javafx.properties")
              outputs.file(javafxProperties)
  
+             if (targetProperties.containsKey("javafxPlatformProperties")) {
+                 final File javafxPlatformProperties = file("${moduleLibDir}/javafx.platform.properties")
+                 outputs.file(javafxPlatformProperties)
+             }
+ 
              doLast {
                  mkdir moduleLibDir
  
                  javafxProperties.delete()
                  javafxProperties << "javafx.version=$RELEASE_VERSION_SHORT";
*** 4145,4156 ****
                  }
  
                  // Embedded builds define this file as well
                  if (targetProperties.containsKey("javafxPlatformProperties")) {
                      final File javafxPlatformProperties = file("${moduleLibDir}/javafx.platform.properties")
-                     outputs.file(javafxPlatformProperties)
- 
                      javafxPlatformProperties.delete()
                      javafxPlatformProperties << targetProperties.javafxPlatformProperties
                      javafxPlatformProperties << "\n"
                  }
              }
--- 4146,4155 ----