< prev index next >
./build.gradle
Print this page
rev 10863 : 8199071: Fix gradle deprecation warnings
Reviewed-by:
*** 811,823 ****
if (proj.hasProperty("moduleName") &&
proj.buildModule &&
!(!test && proj.name.equals(pname))) {
File dir;
if (test && proj.sourceSets.hasProperty('shims')) {
! dir = new File(proj.sourceSets.shims.output.classesDir, proj.ext.moduleName);
} else {
! dir = new File(proj.sourceSets.main.output.classesDir, proj.ext.moduleName);
}
if (mp == null) {
mp = dir.path
} else {
mp = mp + File.pathSeparator + dir.path
--- 811,823 ----
if (proj.hasProperty("moduleName") &&
proj.buildModule &&
!(!test && proj.name.equals(pname))) {
File dir;
if (test && proj.sourceSets.hasProperty('shims')) {
! dir = new File(proj.sourceSets.shims.java.outputDir, proj.ext.moduleName);
} else {
! dir = new File(proj.sourceSets.main.java.outputDir, proj.ext.moduleName);
}
if (mp == null) {
mp = dir.path
} else {
mp = mp + File.pathSeparator + dir.path
*** 861,878 ****
}
// perform common project manipulation for modules
void commonModuleSetup(Project p, List<String> moduleChain) {
- // Allow the build to use either gradle 3.x or gradle 4.x
- p.sourceSets.main.output.classesDir = new File(p.buildDir, "classes/main")
p.ext.moduleChain = moduleChain
if (p.hasProperty("moduleName")) {
! p.ext.moduleDir = new File (p.sourceSets.main.output.classesDir, "${p.moduleName}")
if (p.sourceSets.hasProperty('shims')) {
! p.ext.moduleShimsDir = new File (p.sourceSets.shims.output.classesDir, "${p.moduleName}")
}
}
def mpa = computeModulePathArgs(p.name, moduleChain, false)
if (mpa != null) {
--- 861,876 ----
}
// perform common project manipulation for modules
void commonModuleSetup(Project p, List<String> moduleChain) {
p.ext.moduleChain = moduleChain
if (p.hasProperty("moduleName")) {
! p.ext.moduleDir = new File (p.sourceSets.main.java.outputDir, "${p.moduleName}")
if (p.sourceSets.hasProperty('shims')) {
! p.ext.moduleShimsDir = new File (p.sourceSets.shims.java.outputDir, "${p.moduleName}")
}
}
def mpa = computeModulePathArgs(p.name, moduleChain, false)
if (mpa != null) {
*** 1301,1319 ****
}
void addJSL(Project project, String name, String pkg, List<String> addExports, Closure compile) {
def lowerName = name.toLowerCase()
! def modulePath = "${project.sourceSets.main.output.classesDir}"
! modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/main"
def compileCompilers = project.task("compile${name}Compilers",
type: JavaCompile,
dependsOn: project.compileJava) {
description = "Compile the $name JSL Compilers"
classpath =
! project.files(project.sourceSets.jslc.output.classesDir) +
project.configurations.antlr
source = [project.file("src/main/jsl-$lowerName")]
destinationDir = project.file("$project.buildDir/classes/jsl-compilers/$lowerName")
options.compilerArgs.addAll([
--- 1299,1317 ----
}
void addJSL(Project project, String name, String pkg, List<String> addExports, Closure compile) {
def lowerName = name.toLowerCase()
! def modulePath = "${project.sourceSets.main.java.outputDir}"
! modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/java/main"
def compileCompilers = project.task("compile${name}Compilers",
type: JavaCompile,
dependsOn: project.compileJava) {
description = "Compile the $name JSL Compilers"
classpath =
! project.files(project.sourceSets.jslc.java.outputDir) +
project.configurations.antlr
source = [project.file("src/main/jsl-$lowerName")]
destinationDir = project.file("$project.buildDir/classes/jsl-compilers/$lowerName")
options.compilerArgs.addAll([
*** 1786,1796 ****
source = project.sourceSets.main.java.srcDirs
source += "$buildDir/gensrc/java"
source += project.sourceSets.shaders.output
! destinationDir = project.sourceSets.main.output.classesDir
options.compilerArgs.addAll([
'-h', "$buildDir/gensrc/headers/", // Note: this creates the native headers
'-implicit:none',
'--module-source-path', defaultModuleSourcePath
] )
--- 1784,1794 ----
source = project.sourceSets.main.java.srcDirs
source += "$buildDir/gensrc/java"
source += project.sourceSets.shaders.output
! destinationDir = project.sourceSets.main.java.outputDir
options.compilerArgs.addAll([
'-h', "$buildDir/gensrc/headers/", // Note: this creates the native headers
'-implicit:none',
'--module-source-path', defaultModuleSourcePath
] )
*** 1931,1942 ****
// The native library must be copied over during SDK creation time in the "sdk" task. In
// addition to these steps, the clean task is created. Note that I didn't bother to create
// a new task for each of the decora files, preferring instead just to create a rule?? Also
// need "clean" tasks for each compile task.
! def modulePath = "${project.sourceSets.main.output.classesDir}"
! modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/main"
addJSL(project, "Decora", "com/sun/scenario/effect/impl/hw/d3d/hlsl", decoraAddExports) { sourceDir, destinationDir ->
[[fileName: "ColorAdjust", generator: "CompileJSL", outputs: "-all"],
[fileName: "Brightpass", generator: "CompileJSL", outputs: "-all"],
[fileName: "SepiaTone", generator: "CompileJSL", outputs: "-all"],
[fileName: "PerspectiveTransform", generator: "CompileJSL", outputs: "-all"],
--- 1929,1940 ----
// The native library must be copied over during SDK creation time in the "sdk" task. In
// addition to these steps, the clean task is created. Note that I didn't bother to create
// a new task for each of the decora files, preferring instead just to create a rule?? Also
// need "clean" tasks for each compile task.
! def modulePath = "${project.sourceSets.main.java.outputDir}"
! modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/java/main"
addJSL(project, "Decora", "com/sun/scenario/effect/impl/hw/d3d/hlsl", decoraAddExports) { sourceDir, destinationDir ->
[[fileName: "ColorAdjust", generator: "CompileJSL", outputs: "-all"],
[fileName: "Brightpass", generator: "CompileJSL", outputs: "-all"],
[fileName: "SepiaTone", generator: "CompileJSL", outputs: "-all"],
[fileName: "PerspectiveTransform", generator: "CompileJSL", outputs: "-all"],
*** 1949,1959 ****
javaexec {
executable = JAVA
workingDir = project.projectDir
main = settings.generator
classpath = configurations.compile + configurations.antlr
! classpath += files(project.sourceSets.jslc.output.classesDir)
classpath += files("${project.projectDir}/src/jslc/resources")
classpath += files("$buildDir/classes/jsl-compilers/decora")
jvmArgs += "--module-path=$modulePath"
--- 1947,1957 ----
javaexec {
executable = JAVA
workingDir = project.projectDir
main = settings.generator
classpath = configurations.compile + configurations.antlr
! classpath += files(project.sourceSets.jslc.java.outputDir)
classpath += files("${project.projectDir}/src/jslc/resources")
classpath += files("$buildDir/classes/jsl-compilers/decora")
jvmArgs += "--module-path=$modulePath"
*** 2038,2048 ****
javaexec {
executable = JAVA
workingDir = project.projectDir
main = "CompileJSL"
classpath = configurations.compile + configurations.antlr
! classpath += files(project.sourceSets.jslc.output.classesDir)
classpath += files(project.sourceSets.jslc.resources)
classpath += files("$buildDir/classes/jsl-compilers/prism",
project.projectDir.path + "/src/main/jsl-prism") // for the .stg
args = ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/prism", "-d3d", "-es2", "-name", "$file"]
}
--- 2036,2046 ----
javaexec {
executable = JAVA
workingDir = project.projectDir
main = "CompileJSL"
classpath = configurations.compile + configurations.antlr
! classpath += files(project.sourceSets.jslc.java.outputDir)
classpath += files(project.sourceSets.jslc.resources)
classpath += files("$buildDir/classes/jsl-compilers/prism",
project.projectDir.path + "/src/main/jsl-prism") // for the .stg
args = ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/prism", "-d3d", "-es2", "-name", "$file"]
}
*** 2055,2065 ****
project.cleanNativeAllTask.dependsOn cleanNativeDecora
assemble.dependsOn nativeDecora
processResources.dependsOn processDecoraShaders, processPrismShaders
test {
! def cssDir = file("$buildDir/classes/main/javafx")
jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit",
"-DCSS_META_DATA_TEST_DIR=$cssDir"
enableAssertions = true
testLogging.exceptionFormat = "full"
scanForTestClasses = false
--- 2053,2063 ----
project.cleanNativeAllTask.dependsOn cleanNativeDecora
assemble.dependsOn nativeDecora
processResources.dependsOn processDecoraShaders, processPrismShaders
test {
! def cssDir = file("$buildDir/classes/java/main/${moduleName}/javafx")
jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit",
"-DCSS_META_DATA_TEST_DIR=$cssDir"
enableAssertions = true
testLogging.exceptionFormat = "full"
scanForTestClasses = false
*** 2070,2080 ****
}
// To enable the IDEs to all be happy (no red squiggles) we need to have the libraries
// available in some known location. Maybe in the future the Gradle plugins to each
// of the IDEs will be good enough that we won't need this hack anymore.
! classes << {
// Copy all of the download libraries to the libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
// In some IDEs (Eclipse for example), touching these libraries
// cauese a full build within the IDE. When gradle is used
--- 2068,2079 ----
}
// To enable the IDEs to all be happy (no red squiggles) we need to have the libraries
// available in some known location. Maybe in the future the Gradle plugins to each
// of the IDEs will be good enough that we won't need this hack anymore.
! classes {
! doLast {
// Copy all of the download libraries to the libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
// In some IDEs (Eclipse for example), touching these libraries
// cauese a full build within the IDE. When gradle is used
*** 2100,2109 ****
--- 2099,2109 ----
include "**/antlr-complete-3.5.2.jar"
includeEmptyDirs = false
}
}
}
+ }
compileJava.options.compilerArgs.addAll(qualExportsCore)
}
project(":controls") {
*** 2127,2148 ****
testCompile project(":graphics").sourceSets.test.output
testCompile project(":base").sourceSets.test.output
}
test {
! def cssDir = file("$buildDir/classes/main/javafx")
jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit",
"-DCSS_META_DATA_TEST_DIR=$cssDir"
}
List<String> css2BinAddExports = [
'--add-exports=java.base/sun.util.logging=javafx.graphics',
]
! def modulePath = "${project.sourceSets.main.output.classesDir}"
! modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.graphics/build/classes/main"
! modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/main"
! processResources << {
def cssFiles = fileTree(dir: "$moduleDir/com/sun/javafx/scene/control/skin")
cssFiles.include "**/*.css"
cssFiles.each { css ->
logger.info("converting CSS to BSS ${css}");
--- 2127,2149 ----
testCompile project(":graphics").sourceSets.test.output
testCompile project(":base").sourceSets.test.output
}
test {
! def cssDir = file("$buildDir/classes/java/main/${moduleName}/javafx")
jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit",
"-DCSS_META_DATA_TEST_DIR=$cssDir"
}
List<String> css2BinAddExports = [
'--add-exports=java.base/sun.util.logging=javafx.graphics',
]
! def modulePath = "${project.sourceSets.main.java.outputDir}"
! modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.graphics/build/classes/java/main"
! modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/java/main"
! processResources {
! doLast {
def cssFiles = fileTree(dir: "$moduleDir/com/sun/javafx/scene/control/skin")
cssFiles.include "**/*.css"
cssFiles.each { css ->
logger.info("converting CSS to BSS ${css}");
*** 2156,2165 ****
--- 2157,2167 ----
main = "com.sun.javafx.css.parser.Css2Bin"
args css
}
}
}
+ }
processShimsResources.dependsOn(project.task("copyShimBss", type: Copy) {
from project.moduleDir
into project.moduleShimsDir
include "**/*.bss"
*** 2213,2223 ****
dependencies {
compile name: SWT_FILE_NAME
}
! classes << {
// Copy all of the download libraries to libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
File swtLib = new File(libsDir, "swt-debug.jar")
libsDir.mkdirs();
--- 2215,2226 ----
dependencies {
compile name: SWT_FILE_NAME
}
! classes {
! doLast {
// Copy all of the download libraries to libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
File swtLib = new File(libsDir, "swt-debug.jar")
libsDir.mkdirs();
*** 2235,2244 ****
--- 2238,2248 ----
includeEmptyDirs = false
rename ".*swt.*jar", "swt-debug\\.jar"
}
}
}
+ }
compileJava.options.compilerArgs.addAll([
"--add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
"--add-exports=javafx.graphics/com.sun.javafx.cursor=ALL-UNNAMED",
"--add-exports=javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED",
*** 2465,2475 ****
exclude "**/*.html"
if (IS_MAC) exclude "**/ja_JP.UTF-8/**"
}
processResources.dependsOn man
! String buildClassesDir = "${sourceSets.main.output.classesDir}/${moduleName}"
// Compile the native launchers. These are included in jdk.packager.jmod.
if (IS_WINDOWS && COMPILE_FXPACKAGER) {
task buildWinLauncher(type: CCTask, group: "Build") {
description = "Compiles native sources for the application co-bundle launcher";
--- 2469,2479 ----
exclude "**/*.html"
if (IS_MAC) exclude "**/ja_JP.UTF-8/**"
}
processResources.dependsOn man
! String buildClassesDir = "${sourceSets.main.java.outputDir}/${moduleName}"
// Compile the native launchers. These are included in jdk.packager.jmod.
if (IS_WINDOWS && COMPILE_FXPACKAGER) {
task buildWinLauncher(type: CCTask, group: "Build") {
description = "Compiles native sources for the application co-bundle launcher";
*** 2658,2668 ****
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")
libsDir.mkdirs();
--- 2662,2673 ----
if (COMPILE_FXPACKAGER) {
assemble.dependsOn compileLauncher;
assemble.dependsOn buildJavaPackager
}
! 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();
*** 2676,2685 ****
--- 2681,2691 ----
include "**/ant-1.8.2.jar"
includeEmptyDirs = false
}
}
}
+ }
task setupPackagerFakeJar(type: Copy) {
from "$projectDir/src/main/resources/com/oracle/tools/packager/linux/javalogo_white_48.png"
from "$projectDir/src/main/resources/com/oracle/tools/packager/mac/GenericAppHiDPI.icns"
from "$projectDir/src/main/resources/com/oracle/tools/packager/windows/javalogo_white_48.ico"
*** 2779,2789 ****
from (project.file("$rootProject.buildDir/modular-sdk/modules/jdk.packager.services")) {
include "**"
}
! from (project.file("$rootProject.buildDir/../modules/jdk.packager/build/classes/main/jdk.packager.services")) {
include "module-info.class"
}
}
}
--- 2785,2795 ----
from (project.file("$rootProject.buildDir/modular-sdk/modules/jdk.packager.services")) {
include "**"
}
! from (project.file("$rootProject.buildDir/../modules/jdk.packager/build/classes/java/main/jdk.packager.services")) {
include "module-info.class"
}
}
}
*** 2798,2808 ****
from (project.file("$rootProject.buildDir/modular-sdk/modules/jdk.packager")) {
include "**"
}
! from (project.file("$rootProject.buildDir/../modules/jdk.packager/build/classes/main/jdk.packager")) {
include "module-info.class"
}
}
}
--- 2804,2814 ----
from (project.file("$rootProject.buildDir/modular-sdk/modules/jdk.packager")) {
include "**"
}
! from (project.file("$rootProject.buildDir/../modules/jdk.packager/build/classes/java/main/jdk.packager")) {
include "module-info.class"
}
}
}
*** 3424,3434 ****
}
buildNative.dependsOn buildAVPlugin
}
if (t.name == "win") {
! def buildResources = task("buildResources") << {
def rcOutputDir = "${nativeOutputDir}/${buildType}"
mkdir rcOutputDir
exec {
environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
commandLine (WIN.media.rcCompiler)
--- 3430,3441 ----
}
buildNative.dependsOn buildAVPlugin
}
if (t.name == "win") {
! def buildResources = task("buildResources") {
! doLast {
def rcOutputDir = "${nativeOutputDir}/${buildType}"
mkdir rcOutputDir
exec {
environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
commandLine (WIN.media.rcCompiler)
*** 3455,3464 ****
--- 3462,3472 ----
commandLine (WIN.media.rcCompiler)
args(WIN.media.jfxmediaRcFlags)
args("/Fo${rcOutputDir}/${WIN.media.jfxmediaRcFile}", WIN.media.rcSource)
}
}
+ }
def buildGlib = task("build${t.capital}Glib", dependsOn: [buildResources]) {
enabled = IS_COMPILE_MEDIA
doLast {
exec {
*** 3685,3695 ****
compileNativeTask.dependsOn rcTask
}
def compileJavaDOMBindingTask = task("compileJavaDOMBinding${t.capital}", type: JavaCompile,
dependsOn: [compileJava, compileNativeTask, copyNativeTask]) {
! destinationDir = file("$buildDir/classes/main")
classpath = configurations.compile
source = project.sourceSets.main.java.srcDirs
options.compilerArgs.addAll([
'-implicit:none',
'--module-source-path', defaultModuleSourcePath
--- 3693,3703 ----
compileNativeTask.dependsOn rcTask
}
def compileJavaDOMBindingTask = task("compileJavaDOMBinding${t.capital}", type: JavaCompile,
dependsOn: [compileJava, compileNativeTask, copyNativeTask]) {
! destinationDir = file("$buildDir/classes/java/main")
classpath = configurations.compile
source = project.sourceSets.main.java.srcDirs
options.compilerArgs.addAll([
'-implicit:none',
'--module-source-path', defaultModuleSourcePath
*** 3706,3716 ****
def drtClasses = "**/com/sun/javafx/webkit/drt/**"
task drtJar(type: Jar, dependsOn: compileJava) {
archiveName = "drt.jar"
destinationDir = file("$buildDir/test")
! from "$buildDir/classes/main/javafx.web/"
include drtClasses
includeEmptyDirs = false
}
if (IS_COMPILE_WEBKIT) {
--- 3714,3724 ----
def drtClasses = "**/com/sun/javafx/webkit/drt/**"
task drtJar(type: Jar, dependsOn: compileJava) {
archiveName = "drt.jar"
destinationDir = file("$buildDir/test")
! from "$buildDir/classes/java/main/javafx.web/"
include drtClasses
includeEmptyDirs = false
}
if (IS_COMPILE_WEBKIT) {
*** 3797,3807 ****
enabled = IS_FULL_TEST
destinationDir = file("$buildDir/testapp1")
archiveName = testapp1JarName
includeEmptyDirs = false
! from project.sourceSets.testapp1.output.classesDir
include("testapp/**")
include("com/javafx/main/**")
manifest {
attributes(
--- 3805,3815 ----
enabled = IS_FULL_TEST
destinationDir = file("$buildDir/testapp1")
archiveName = testapp1JarName
includeEmptyDirs = false
! from project.sourceSets.testapp1.java.outputDir
include("testapp/**")
include("com/javafx/main/**")
manifest {
attributes(
*** 3818,3828 ****
enabled = IS_FULL_TEST
destinationDir = file("$buildDir/testapp1")
archiveName = "jar2.jar";
includeEmptyDirs = false
! from project.sourceSets.testapp1.output.classesDir
include("pkg2/**")
}
task createTestApps() {
dependsOn(createTestapp1Jar1)
--- 3826,3836 ----
enabled = IS_FULL_TEST
destinationDir = file("$buildDir/testapp1")
archiveName = "jar2.jar";
includeEmptyDirs = false
! from project.sourceSets.testapp1.java.outputDir
include("pkg2/**")
}
task createTestApps() {
dependsOn(createTestapp1Jar1)
*** 3832,3842 ****
def modtestapps = [ "testapp2", "testapp3", "testapp4", "testapp5", "testapp6" ]
modtestapps.each { testapp ->
def testappCapital = testapp.capitalize()
def copyTestAppTask = task("copy${testappCapital}", type: Copy) {
! from project.sourceSets."${testapp}".output.classesDir
from project.sourceSets."${testapp}".output.resourcesDir
into "${project.buildDir}/modules/${testapp}"
}
def List<String> testAppSourceDirs = []
--- 3840,3850 ----
def modtestapps = [ "testapp2", "testapp3", "testapp4", "testapp5", "testapp6" ]
modtestapps.each { testapp ->
def testappCapital = testapp.capitalize()
def copyTestAppTask = task("copy${testappCapital}", type: Copy) {
! from project.sourceSets."${testapp}".java.outputDir
from project.sourceSets."${testapp}".output.resourcesDir
into "${project.buildDir}/modules/${testapp}"
}
def List<String> testAppSourceDirs = []
*** 3959,3969 ****
])
}
project.compileShimsJava.dependsOn(project.compileJava)
def copyGeneratedShimsTask = task("copyGeneratedShims", type: Copy, dependsOn: [compileShimsJava, processShimsResources]) {
! from project.sourceSets.shims.output.classesDir
into "${rootProject.buildDir}/shims"
exclude("*/module-info.class")
}
project.processShimsResources.dependsOn(project.processResources)
--- 3967,3977 ----
])
}
project.compileShimsJava.dependsOn(project.compileJava)
def copyGeneratedShimsTask = task("copyGeneratedShims", type: Copy, dependsOn: [compileShimsJava, processShimsResources]) {
! from project.sourceSets.shims.java.outputDir
into "${rootProject.buildDir}/shims"
exclude("*/module-info.class")
}
project.processShimsResources.dependsOn(project.processResources)
*** 4206,4237 ****
enabled = COMPILE_SWT
group = "Basic"
description = "Creates the javafx-swt.jar for the $t.name target"
archiveName = "${project(":swt").buildDir}/libs/javafx-swt.jar";
includeEmptyDirs = false
! from("${project(":swt").buildDir}/classes/main");
include("**/javafx/embed/swt/**")
dependsOn(
project(":swt").compileJava,
project(":swt").processResources,
// note: assemble and classes are not enough for DidWork
project(":swt").classes,
// classes is needed for a jar copy
)
- onlyIf {
- dependsOnTaskDidWork()
- }
}
// FIXME: do we really need the index task for this modular jar?
def javafxSwtIndexTask = task("javafxSwtIndex$t.capital") {
//the following is a workaround for the lack of indexing in gradle 1.4 through 1.7
dependsOn(javafxSwtTask)
- onlyIf {
- dependsOnTaskDidWork()
- }
doLast() {
ant.jar (update: true, index: true, destfile: javafxSwtTask.archiveName)
}
}
--- 4214,4239 ----
enabled = COMPILE_SWT
group = "Basic"
description = "Creates the javafx-swt.jar for the $t.name target"
archiveName = "${project(":swt").buildDir}/libs/javafx-swt.jar";
includeEmptyDirs = false
! from("${project(":swt").buildDir}/classes/java/main");
include("**/javafx/embed/swt/**")
dependsOn(
project(":swt").compileJava,
project(":swt").processResources,
// note: assemble and classes are not enough for DidWork
project(":swt").classes,
// classes is needed for a jar copy
)
}
// FIXME: do we really need the index task for this modular jar?
def javafxSwtIndexTask = task("javafxSwtIndex$t.capital") {
//the following is a workaround for the lack of indexing in gradle 1.4 through 1.7
dependsOn(javafxSwtTask)
doLast() {
ant.jar (update: true, index: true, destfile: javafxSwtTask.archiveName)
}
}
*** 4576,4586 ****
moduleProjList.each { project ->
def buildModuleClassesTask = project.task("buildModule$t.capital", group: "Build", type: Copy) {
dependsOn(project.assemble)
def buildDir = project.buildDir
def sourceBuildDirs = [
! "${buildDir}/classes/main/${project.moduleName}",
]
def moduleClassesDir = "$buildDir/${platformPrefix}module-classes"
includeEmptyDirs = false
sourceBuildDirs.each { d ->
--- 4578,4588 ----
moduleProjList.each { project ->
def buildModuleClassesTask = project.task("buildModule$t.capital", group: "Build", type: Copy) {
dependsOn(project.assemble)
def buildDir = project.buildDir
def sourceBuildDirs = [
! "${buildDir}/classes/java/main/${project.moduleName}",
]
def moduleClassesDir = "$buildDir/${platformPrefix}module-classes"
includeEmptyDirs = false
sourceBuildDirs.each { d ->
*** 4664,4675 ****
"${ctrlbld}/resources/android")
} else if (t.name == 'ios') {
from ("${webbld}/classes/ios",
"${webbld}/resources/ios")
} else {
! from ("${webbld}/classes/main",
! "${webbld}resources/main")
}
*/
}
buildModulesTask.dependsOn(buildModuleClassesTask)
}
--- 4666,4676 ----
"${ctrlbld}/resources/android")
} else if (t.name == 'ios') {
from ("${webbld}/classes/ios",
"${webbld}/resources/ios")
} else {
! from ("${webbld}/classes/java/main")
}
*/
}
buildModulesTask.dependsOn(buildModuleClassesTask)
}
< prev index next >