./build.gradle

rev 7322 : RT-37594: Make lens build optional
Reviewed-by:

*** 629,638 ****
--- 629,639 ----
  
      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
  
      // This value is used to under ./build/${sdkDirName} to allow for
*** 2738,2747 ****
--- 2739,2751 ----
              exclude ("com/sun/prism/es2/EGL*")
          }
          if (!targetProperties.includeLens) {
              exclude ("com/sun/glass/ui/lens")
          }
+         if (!targetProperties.includeMonocle) {
+             exclude ("com/sun/glass/ui/monocle")
+         }
          if (!targetProperties.includeNull3d) {
              // "com/sun/prism/null3d", // TODO This is used in dev builds but not the final sdk
              exclude ("com/sun/prism/null3d")
          }
          if (t.name != 'ios') {
*** 2886,2907 ****
  
              // Create the javafx.properties file
              final File javafxProperties = file("build/${sdkDirName}/rt/lib/javafx.properties")
              javafxProperties.delete()
              javafxProperties << "javafx.runtime.version=$RAW_VERSION";
              // Include any properties that have been defined (most likely in
              // one of the various platform gradle files)
              if (targetProperties.containsKey("javafxProperties")) {
-                 javafxProperties << "\n"
                  javafxProperties << targetProperties.javafxProperties
              }
  
              // Embedded builds define this file as well
              if (targetProperties.containsKey("javafxPlatformProperties")) {
                  final File javafxPlatformProperties = file("build/${sdkDirName}/rt/lib/javafx.platform.properties")
                  javafxPlatformProperties.delete()
                  javafxPlatformProperties << targetProperties.javafxPlatformProperties
              }
  
              // Copy over the javadocs that were generated. This is done rather than just generating
              // the docs into the "right place" because for a cross-compile you only need one set of
              // docs but need to have a copy in each created sdk
--- 2890,2913 ----
  
              // Create the javafx.properties file
              final File javafxProperties = file("build/${sdkDirName}/rt/lib/javafx.properties")
              javafxProperties.delete()
              javafxProperties << "javafx.runtime.version=$RAW_VERSION";
+             javafxProperties << "\n"
              // Include any properties that have been defined (most likely in
              // one of the various platform gradle files)
              if (targetProperties.containsKey("javafxProperties")) {
                  javafxProperties << targetProperties.javafxProperties
+                 javafxProperties << "\n"
              }
  
              // Embedded builds define this file as well
              if (targetProperties.containsKey("javafxPlatformProperties")) {
                  final File javafxPlatformProperties = file("build/${sdkDirName}/rt/lib/javafx.platform.properties")
                  javafxPlatformProperties.delete()
                  javafxPlatformProperties << targetProperties.javafxPlatformProperties
+                 javafxPlatformProperties << "\n"
              }
  
              // Copy over the javadocs that were generated. This is done rather than just generating
              // the docs into the "right place" because for a cross-compile you only need one set of
              // docs but need to have a copy in each created sdk