diff options
Diffstat (limited to 'java/openjfx8-devel/files/patch-build.gradle')
| -rw-r--r-- | java/openjfx8-devel/files/patch-build.gradle | 276 |
1 files changed, 78 insertions, 198 deletions
diff --git a/java/openjfx8-devel/files/patch-build.gradle b/java/openjfx8-devel/files/patch-build.gradle index cf1fd4e50a79..60783880255f 100644 --- a/java/openjfx8-devel/files/patch-build.gradle +++ b/java/openjfx8-devel/files/patch-build.gradle @@ -1,6 +1,6 @@ ---- build.gradle.orig 2018-01-16 01:40:56 UTC +--- build.gradle.orig 2018-12-10 16:30:22 UTC +++ build.gradle -@@ -251,6 +251,7 @@ ext.IS_64 = OS_ARCH.toLowerCase().contains("64") +@@ -253,6 +253,7 @@ ext.IS_64 = OS_ARCH.toLowerCase().contains("64") ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin") ext.IS_WINDOWS = OS_NAME.contains("windows") ext.IS_LINUX = OS_NAME.contains("linux") @@ -8,7 +8,7 @@ // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified, // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, and/or JAVAH, all of which may be specified -@@ -311,7 +312,7 @@ defineProperty("COMPILE_MEDIA", "false") +@@ -313,7 +314,7 @@ defineProperty("COMPILE_MEDIA", "false") ext.IS_COMPILE_MEDIA = Boolean.parseBoolean(COMPILE_MEDIA) // COMPILE_PANGO specifies whether to build javafx_font_pango. @@ -17,17 +17,17 @@ ext.IS_COMPILE_PANGO = Boolean.parseBoolean(COMPILE_PANGO) // COMPILE_HARFBUZZ specifies whether to use Harfbuzz. -@@ -342,7 +343,8 @@ ext.SWT_FILE_NAME = IS_MAC ? "org.eclipse.swt.cocoa.ma - IS_WINDOWS && IS_64 ? "org.eclipse.swt.win32.win32.x86_64_3.7.2.v3740f" : - IS_WINDOWS && !IS_64 ? "org.eclipse.swt.win32.win32.x86_3.7.2.v3740f" : - IS_LINUX && IS_64 ? "org.eclipse.swt.gtk.linux.x86_64_3.7.2.v3740f" : -- IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.7.2.v3740f" : "" -+ IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.7.2.v3740f" : +@@ -344,7 +345,8 @@ ext.SWT_FILE_NAME = IS_MAC ? "org.eclipse.swt.cocoa.ma + IS_WINDOWS && IS_64 ? "org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512" : + IS_WINDOWS && !IS_64 ? "org.eclipse.swt.win32.win32.x86_3.105.3.v20170228-0512" : + IS_LINUX && IS_64 ? "org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512" : +- IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.105.3.v20170228-0512" : "" ++ IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.105.3.v20170228-0512" : + IS_BSD ? "/usr/local/share/java/classes/swt-devel.jar" : "" // Build javadocs only if BUILD_JAVADOC=true defineProperty("BUILD_JAVADOC", "false") -@@ -402,6 +404,12 @@ if (IS_MAC) { +@@ -404,6 +406,12 @@ if (IS_MAC) { defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}") } @@ -40,7 +40,7 @@ // // The next three sections of properties are used to generate the // VersionInfo class, and the Windows DLL manifest. -@@ -442,7 +450,7 @@ defineProperty("RELEASE_MILESTONE", jfxReleaseMileston +@@ -444,7 +452,7 @@ defineProperty("RELEASE_MILESTONE", jfxReleaseMileston // Check whether the COMPILE_TARGETS property has been specified (if so, it was done by // the user and not by this script). If it has not been defined then default // to building the normal desktop build for this machine @@ -49,7 +49,7 @@ defineProperty("COMPILE_TARGETS", "$defaultHostTarget") // Flag indicating whether to import cross compile tools -@@ -549,7 +557,7 @@ void fetchExternalTools(String configName, List packag +@@ -551,7 +559,7 @@ void fetchExternalTools(String configName, List packag def File pkgdir = file("$destdir/$basename") if (pkgname.endsWith(".tgz")) { @@ -58,7 +58,7 @@ // use native tar to support symlinks pkgdir.mkdirs() exec { -@@ -674,7 +682,7 @@ compileTargets { t -> +@@ -676,7 +684,7 @@ compileTargets { t -> if (!targetProperties.containsKey('includeMonocle')) targetProperties.includeMonocle = false if (!targetProperties.containsKey('includeEGL')) targetProperties.includeEGL = false @@ -67,7 +67,7 @@ // This value is used to under ./build/${sdkDirName} to allow for // a common name for the hosted build (for use when building apps) -@@ -706,7 +714,7 @@ compileTargets { t -> +@@ -708,7 +716,7 @@ compileTargets { t -> // at present building on PI is not supported, but we would only need to make // some changes on assumptions on what should be built (like SWT / Swing) and // such and we could probably make it work. @@ -76,7 +76,7 @@ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { throw new Exception("Unknown and unsupported build architecture: $OS_ARCH") } else if (IS_MAC && OS_ARCH != "x86_64") { -@@ -1169,7 +1177,8 @@ allprojects { +@@ -1165,7 +1173,8 @@ allprojects { // By default all of our projects require junit for testing so we can just // setup this dependency here. dependencies { @@ -86,7 +86,7 @@ if (BUILD_CLOSED && DO_JCOV) { testCompile name: "jcov" } -@@ -1307,12 +1316,15 @@ project(":graphics") { +@@ -1303,12 +1312,15 @@ project(":graphics") { dependencies { compile project(":base"), BUILD_SRC @@ -107,47 +107,17 @@ } // Create a single "native" task which will depend on all the individual native tasks for graphics -@@ -1461,7 +1473,7 @@ project(":graphics") { - workingDir = "modules/graphics" - main = settings.generator - classpath = configurations.compile + configurations.antlr3 -- classpath += files("$buildDir/classes/main") -+ classpath += files("$buildDir/classes/java/main") - classpath += files("$buildDir/classes/jsl-compilers/decora") - args = ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/scenario/effect", "$settings.outputs", "$settings.fileName"] - jvmArgs "-Djava.ext.dirs=" -@@ -1472,9 +1484,9 @@ project(":graphics") { - task generateDecoraNativeHeaders(type: JavaHeaderTask, dependsOn: compileDecoraJavaShaders) { - description = "Generates JNI Headers for Decora SSE Natives" - source file("$buildDir/classes/jsl-decora") -- source file("$buildDir/classes/main") -+ source file("$buildDir/classes/java/main") - include("com/sun/scenario/effect/impl/sw/sse/*"); -- classpath = files("$buildDir/classes/main", "$buildDir/classes/jsl-decora") -+ classpath = files("$buildDir/classes/java/main", "$buildDir/classes/jsl-decora") - output = file("$buildDir/generated-src/headers/jsl-decora") - } - -@@ -1602,9 +1614,7 @@ project(":graphics") { - copy { - into libsDir - from f.getParentFile() -- include "**/antlr-3.1.3.jar" -- include "**/stringtemplate-3.2.jar" -- include "**/antlr-runtime-3.1.3.jar" -+ include "**/antlr-3.5.2-complete.jar" - includeEmptyDirs = false - } - // Have to rename the swt jar because it is some platform specific name but -@@ -1651,7 +1661,7 @@ project(":controls") { - javaexec { - executable = JAVA - workingDir = "modules/controls" -- classpath files("$buildDir/classes/main", -+ classpath files("$buildDir/classes/java/main", - project(":graphics").sourceSets.main.output, - project(":base").sourceSets.main.output) - main = "com.sun.javafx.css.parser.Css2Bin" +@@ -1599,9 +1611,7 @@ project(":graphics") { + copy { + into libsDir + from f.getParentFile() +- include "**/antlr-3.1.3.jar" +- include "**/stringtemplate-3.2.jar" +- include "**/antlr-runtime-3.1.3.jar" ++ include "**/antlr-3.5.2-complete.jar" + includeEmptyDirs = false + } + // Have to rename the swt jar because it is some platform specific name but @@ -1688,7 +1698,11 @@ project(":swt") { } dependencies { @@ -161,7 +131,7 @@ } } -@@ -1787,7 +1801,7 @@ project(":fxpackager") { +@@ -1794,7 +1808,7 @@ project(":fxpackager") { } dependencies { @@ -170,30 +140,23 @@ } // When producing the jar, we need to relocate a few class files -@@ -2038,7 +2052,7 @@ project(":fxpackager") { - description = "Creates the packager.jar" - archiveName = "packager.jar"; - includeEmptyDirs = false -- from("$buildDir/classes/main"); -+ from("$buildDir/classes/java/main"); - from("$buildDir/resources/main"); - include('jdk/packager/**') - -@@ -2048,21 +2062,6 @@ project(":fxpackager") { +@@ -2055,23 +2069,6 @@ project(":fxpackager") { jar.dependsOn buildJavaPackager jar.dependsOn packagerJar -- 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") -- libsDir.mkdirs(); -- for (File f : configurations.compile.files) { -- copy { -- into libsDir -- from f.getParentFile() -- include "**/ant-1.8.2.jar" -- includeEmptyDirs = false +- classes { +- doLast { +- // 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") +- libsDir.mkdirs(); +- for (File f : configurations.compile.files) { +- copy { +- into libsDir +- from f.getParentFile() +- include "**/ant-1.8.2.jar" +- includeEmptyDirs = false +- } - } - } - } @@ -201,7 +164,7 @@ task packagerFakeJar(type: Jar) { dependsOn compileTestJava from compileTestJava.destinationDir -@@ -2241,7 +2240,7 @@ project(":media") { +@@ -2250,7 +2247,7 @@ project(":media") { doLast { exec { @@ -210,7 +173,7 @@ args("JAVA_HOME=${JDK_HOME}", "GENERATED_HEADERS_DIR=${generatedHeadersDir}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=jfxmedia", "COMPILE_PARFAIT=${compileParfait}") -@@ -2251,7 +2250,7 @@ project(":media") { +@@ -2260,7 +2257,7 @@ project(":media") { args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.jfxmediaRcFile}") } else { args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}") @@ -219,7 +182,7 @@ args(IS_64 ? "ARCH=x64" : "ARCH=x32") } -@@ -2273,7 +2272,7 @@ project(":media") { +@@ -2282,7 +2279,7 @@ project(":media") { enabled = IS_COMPILE_MEDIA doLast { exec { @@ -228,7 +191,7 @@ args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite") if (t.name == "win") { -@@ -2281,7 +2280,7 @@ project(":media") { +@@ -2290,7 +2287,7 @@ project(":media") { args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.gstreamerRcFile}") } else { args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}") @@ -237,7 +200,7 @@ args(IS_64 ? "ARCH=x64" : "ARCH=x32") } } -@@ -2302,7 +2301,7 @@ project(":media") { +@@ -2311,7 +2308,7 @@ project(":media") { doLast { exec { @@ -246,7 +209,7 @@ args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=fxplugins", "ON2_SRCDIR=${project.ext.ON2_SRCDIR}", "ON2_LIB=${project.ext.ON2_LIB}") -@@ -2319,7 +2318,7 @@ project(":media") { +@@ -2328,7 +2325,7 @@ project(":media") { args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.fxpluginsRcFile}") } else { args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}") @@ -255,7 +218,7 @@ args(IS_64 ? "ARCH=x64" : "ARCH=x32") } } -@@ -2329,7 +2328,7 @@ project(":media") { +@@ -2338,7 +2335,7 @@ project(":media") { buildNative.dependsOn buildPlugins @@ -264,7 +227,7 @@ def buildAVPlugin = task( "buildAVPlugin", dependsOn: [buildPlugins]) { enabled = IS_COMPILE_MEDIA -@@ -2340,7 +2339,7 @@ project(":media") { +@@ -2349,7 +2346,7 @@ project(":media") { File dir = file(libavDir) if (dir.exists()) { exec { @@ -273,7 +236,7 @@ args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}", "SUFFIX=", IS_64 ? "ARCH=x64" : "ARCH=x32") -@@ -2353,7 +2352,7 @@ project(":media") { +@@ -2362,7 +2359,7 @@ project(":media") { File dir = file(libavDir) if (dir.exists()) { exec { @@ -282,16 +245,16 @@ args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}", -@@ -2364,7 +2363,7 @@ project(":media") { +@@ -2373,7 +2370,7 @@ project(":media") { } else { // Building fxavcodec plugin (libav plugin) exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin") -+ commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin") ++ commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${t.name}/avplugin") args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=avplugin", IS_64 ? "ARCH=x64" : "ARCH=x32") } -@@ -2412,7 +2411,7 @@ project(":media") { +@@ -2423,7 +2420,7 @@ project(":media") { doLast { exec { environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT) @@ -300,130 +263,53 @@ args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite", IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.glibRcFile}") } -@@ -2425,7 +2424,7 @@ project(":media") { - enabled = IS_COMPILE_MEDIA - doLast { +@@ -2442,7 +2439,7 @@ project(":media") { + } + exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite") args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite") args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}") } -@@ -2478,7 +2477,7 @@ project(":web") { - - task generateHeaders(dependsOn: compileJava) { - doLast { -- def classpath = files("$buildDir/classes/main", -+ def classpath = files("$buildDir/classes/java/main", - project(":graphics").sourceSets.main.output.classesDir) - def dest = file("$buildDir/generated-src/headers"); - mkdir dest; -@@ -2525,7 +2524,7 @@ project(":web") { - +@@ -2562,7 +2559,7 @@ project(":web") { compileTargets { t -> def targetProperties = project.rootProject.ext[t.upper] + def webkitProperties = targetProperties.webkit - def classifier = (t.name != "linux" && t.name != "win") ? t.name : + def classifier = (t.name != "linux" && t.name != "bsd" && t.name != "win") ? t.name : IS_64 ? "${t.name}-amd64" : "${t.name}-i586" def webkitOutputDir = cygpath("$buildDir/${t.name}") -@@ -2592,6 +2591,9 @@ project(":web") { - targetCpuBitDepthSwitch = "--32-bit" - } - -+ cmakeArgs += " -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" -+ cmakeArgs += " -DCMAKE_C_COMPILER:STRING=${System.getenv("CC")}" -+ cmakeArgs += " -DCMAKE_CXX_COMPILER:STRING=${System.getenv("CXX")}" - commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/build-webkit", - "--java", "--icu-unicode", targetCpuBitDepthSwitch, - "--cmakeargs=${cmakeArgs}") -@@ -2634,7 +2636,7 @@ project(":web") { - task drtJar(type: Jar, dependsOn: compileJava) { - archiveName = "drt.jar" - destinationDir = file("$buildDir/test") -- from "$buildDir/classes/main" -+ from "$buildDir/classes/java/main" - include drtClasses - } - if (IS_COMPILE_WEBKIT) { -@@ -2886,22 +2888,22 @@ compileTargets { t -> - description = "Creates the jfxrt.jar for the $t.name target" - archiveName = "build/${sdkDirName}/rt/lib/ext/jfxrt.jar"; - includeEmptyDirs = false -- from("modules/base/build/classes/main", -+ from("modules/base/build/classes/java/main", - "modules/base/build/resources/main", -- "modules/builders/build/classes/main", -- "modules/graphics/build/classes/main", -+ "modules/builders/build/classes/java/main", -+ "modules/graphics/build/classes/java/main", - "modules/graphics/build/resources/main", -- "modules/controls/build/classes/main", -+ "modules/controls/build/classes/java/main", - "modules/controls/build/resources/main", -- "modules/fxml/build/classes/main", -+ "modules/fxml/build/classes/java/main", - "modules/fxml/build/resources/main", - "modules/graphics/build/classes/jsl-decora", - "modules/graphics/build/resources/jsl-decora", - "modules/graphics/build/classes/jsl-prism", - "modules/graphics/build/resources/jsl-prism", -- "modules/media/build/classes/main", -+ "modules/media/build/classes/java/main", - "modules/media/build/resources/main") -- if (COMPILE_SWING) from ("modules/swing/build/classes/main", "modules/swing/build/resources/main") -+ if (COMPILE_SWING) from ("modules/swing/build/classes/java/main", "modules/swing/build/resources/main") - - if (!IS_MAC) { - exclude ("modules/media/build/classes/main/com/sun/media/jfxmediaimpl/platform/osx/**", -@@ -2966,7 +2968,7 @@ compileTargets { t -> - "modules/web/build/resources/ios", - "modules/extensions/build/classes/ios") - } else { -- from ("modules/web/build/classes/main", "modules/web/build/resources/main") -+ from ("modules/web/build/classes/java/main", "modules/web/build/resources/main") - } - - exclude("**/javafx/embed/swt/**") -@@ -3007,8 +3009,8 @@ compileTargets { t -> - description = "Creates the jfxswt.jar for the $t.name target" - archiveName = "build/${sdkDirName}/rt/lib/jfxswt.jar"; - includeEmptyDirs = false -- from("modules/swt/build/classes/main"); -- from("modules/builders/build/classes/main"); -+ from("modules/swt/build/classes/java/main"); -+ from("modules/builders/build/classes/java/main"); - include("**/javafx/embed/swt/**") - exclude("**/*.java"); // Builder java files are in build/classes and should be excluded +@@ -2638,6 +2635,9 @@ project(":web") { + } -@@ -3029,7 +3031,7 @@ compileTargets { t -> - description = "Creates the javafx-mx.jar" - archiveName = "build/${sdkDirName}/lib/javafx-mx.jar"; - includeEmptyDirs = false -- from "modules/jmx/build/classes/main" -+ from "modules/jmx/build/classes/java/main" - from "modules/jmx/build/resources/main" - dependsOn project(":jmx").assemble - } -@@ -3084,7 +3086,7 @@ compileTargets { t -> + cmakeArgs += " -DJAVAFX_RELEASE_VERSION=8.0" ++ cmakeArgs += " -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" ++ cmakeArgs += " -DCMAKE_C_COMPILER:STRING=${System.getenv("CC")}" ++ cmakeArgs += " -DCMAKE_CXX_COMPILER:STRING=${System.getenv("CXX")}" + commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/build-webkit", + "--java", "--icu-unicode", targetCpuBitDepthSwitch, + "--cmakeargs=${cmakeArgs}") +@@ -3132,7 +3132,7 @@ compileTargets { t -> // OSX media natives - [ "jfxmedia_qtkit", "jfxmedia_avf", "glib-lite" ].each { name -> + [ "jfxmedia_qtkit", "jfxmedia_avf" ].each { name -> from ("modules/media/build/native/${t.name}/${mediaBuildType}/${library(name)}") } - } else if (t.name == "linux") { + } else if (t.name == "linux" || t.name == "bsd") { from("modules/media/build/native/${t.name}/${mediaBuildType}") { include "libavplugin*.so" } - } else from ("modules/media/build/native/${t.name}/${mediaBuildType}/${library("glib-lite")}") + } } else { -@@ -3097,7 +3099,7 @@ compileTargets { t -> +@@ -3145,7 +3145,7 @@ compileTargets { t -> // copy libjfxmedia_{avf,qtkit}.dylib if they exist - [ "jfxmedia_qtkit", "jfxmedia_avf", "glib-lite" ].each { name -> + [ "jfxmedia_qtkit", "jfxmedia_avf" ].each { name -> from ("$LIBRARY_STUB/${library(name)}") } - } else if (t.name == "linux") { + } else if (t.name == "linux" || t.name == "bsd") { from(LIBRARY_STUB) { include "libavplugin*.so" } } - else if (t.name != "android" && t.name != "dalvik" ) { -@@ -3162,7 +3164,7 @@ compileTargets { t -> + } +@@ -3207,7 +3207,7 @@ compileTargets { t -> } // Copy over the javapackager executable @@ -432,21 +318,15 @@ copy { from "modules/fxpackager/build/javapackager" into "build/${sdkDirName}/bin" -@@ -3215,10 +3217,11 @@ ext.JFXRT_CP = - project(":fxml").sourceSets.main.output.classesDir, - project(":swing").sourceSets.main.output.classesDir, //NOTE - used by 3Dviewer - project(":builders").sourceSets.main.output.classesDir, -- "modules/media/build/classes/main", -- "modules/web/build/classes/main", -+ "modules/media/build/classes/java/main", -+ "modules/web/build/classes/java/main", +@@ -3264,6 +3264,7 @@ ext.JFXRT_CP = + "modules/web/build/classes/java/main", ) +/* project(":apps") { // The apps build is Ant based, and gradle lets us "import" ant build.xml // into our configuration. -@@ -3295,7 +3298,7 @@ project(":apps") { +@@ -3341,7 +3342,7 @@ project(":apps") { } rootProject.clean.dependsOn(appsClean) } |