8301121: RichTextArea Control (Incubator) #1524
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2795,6 +2795,181 @@ project(":controls") { | |
| addValidateSourceSets(project, sourceSets) | ||
| } | ||
|
|
||
| project(":incubator.input") { | ||
| project.ext.buildModule = true | ||
| project.ext.includeSources = true | ||
| project.ext.moduleRuntime = true | ||
| project.ext.moduleName = "jfx.incubator.input" | ||
| project.ext.incubating = true | ||
|
|
||
| sourceSets { | ||
| main | ||
| shims { | ||
| java { | ||
| compileClasspath += sourceSets.main.output | ||
| runtimeClasspath += sourceSets.main.output | ||
| } | ||
| } | ||
| test { | ||
| java { | ||
| compileClasspath += sourceSets.shims.output | ||
| runtimeClasspath += sourceSets.shims.output | ||
| } | ||
| } | ||
| } | ||
|
|
||
| project.ext.moduleSourcePath = defaultModuleSourcePath | ||
| project.ext.moduleSourcePathShim = defaultModuleSourcePathShim | ||
|
|
||
| commonModuleSetup(project, [ | ||
| 'base', | ||
| 'graphics', | ||
| 'controls', | ||
| 'incubator.input' | ||
| ]) | ||
|
|
||
| dependencies { | ||
| testImplementation project(":base").sourceSets.test.output | ||
| testImplementation project(":graphics").sourceSets.test.output | ||
| testImplementation project(":controls").sourceSets.test.output | ||
| implementation project(':base') | ||
| implementation project(':graphics') | ||
| implementation project(':controls') | ||
| } | ||
|
|
||
| test { | ||
| jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit" | ||
| } | ||
|
|
||
| def modulePath = "${project.sourceSets.main.java.getDestinationDirectory().get().getAsFile()}" | ||
| modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.controls/build/classes/java/main" | ||
| modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.graphics/build/classes/java/main" | ||
| modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/java/main" | ||
|
|
||
| // FIXME: KCR | ||
| // 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}"); | ||
| // | ||
| // javaexec { | ||
| // executable = JAVA | ||
| // workingDir = project.projectDir | ||
| // jvmArgs += patchModuleArgs | ||
| // jvmArgs += "--module-path=$modulePath" | ||
| // jvmArgs += "--add-modules=javafx.graphics" | ||
| // mainClass = "com.sun.javafx.css.parser.Css2Bin" | ||
| // args css | ||
| // } | ||
| // } | ||
| // } | ||
| // } | ||
| // | ||
| // def copyShimBssTask = project.task("copyShimBss", type: Copy, | ||
| // dependsOn: [project.tasks.getByName("compileJava"), | ||
| // project.tasks.getByName("processResources")]) { | ||
| // from project.moduleDir | ||
| // into project.moduleShimsDir | ||
| // include "**/*.bss" | ||
| // } | ||
| // processShimsResources.dependsOn(copyShimBssTask) | ||
|
|
||
| addMavenPublication(project, [ 'graphics' , 'controls']) | ||
|
|
||
| addValidateSourceSets(project, sourceSets) | ||
| } | ||
|
|
||
| project(":incubator.richtext") { | ||
| project.ext.buildModule = true | ||
| project.ext.includeSources = true | ||
| project.ext.moduleRuntime = true | ||
| project.ext.moduleName = "jfx.incubator.richtext" | ||
| project.ext.incubating = true | ||
|
|
||
| sourceSets { | ||
| main | ||
| shims { | ||
| java { | ||
| compileClasspath += sourceSets.main.output | ||
| runtimeClasspath += sourceSets.main.output | ||
| } | ||
| } | ||
| test { | ||
| java { | ||
| compileClasspath += sourceSets.shims.output | ||
| runtimeClasspath += sourceSets.shims.output | ||
| } | ||
| } | ||
| } | ||
|
|
||
| project.ext.moduleSourcePath = defaultModuleSourcePath | ||
| project.ext.moduleSourcePathShim = defaultModuleSourcePathShim | ||
|
|
||
| commonModuleSetup(project, [ | ||
| 'base', | ||
| 'graphics', | ||
| 'controls', | ||
| 'incubator.input', | ||
| 'incubator.richtext' | ||
| ]) | ||
|
|
||
| dependencies { | ||
| testImplementation project(":base").sourceSets.test.output | ||
| testImplementation project(":graphics").sourceSets.test.output | ||
| testImplementation project(":controls").sourceSets.test.output | ||
| testImplementation project(":incubator.input").sourceSets.test.output | ||
| implementation project(':base') | ||
| implementation project(':graphics') | ||
| implementation project(':controls') | ||
| implementation project(':incubator.input') | ||
| } | ||
|
|
||
| test { | ||
| jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit" | ||
| } | ||
|
|
||
| def modulePath = "${project.sourceSets.main.java.getDestinationDirectory().get().getAsFile()}" | ||
| modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.controls/build/classes/java/main" | ||
| modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.graphics/build/classes/java/main" | ||
| modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/java/main" | ||
|
|
||
| // FIXME: KCR | ||
| // processResources { | ||
|
There was a problem hiding this comment. I recommend deleting this commented-out block unless you plan to deliver resources as part of the |
||
| // 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}"); | ||
| // | ||
| // javaexec { | ||
| // executable = JAVA | ||
| // workingDir = project.projectDir | ||
| // jvmArgs += patchModuleArgs | ||
| // jvmArgs += "--module-path=$modulePath" | ||
| // jvmArgs += "--add-modules=javafx.graphics" | ||
| // mainClass = "com.sun.javafx.css.parser.Css2Bin" | ||
| // args css | ||
| // } | ||
| // } | ||
| // } | ||
| // } | ||
| // | ||
| // def copyShimBssTask = project.task("copyShimBss", type: Copy, | ||
| // dependsOn: [project.tasks.getByName("compileJava"), | ||
| // project.tasks.getByName("processResources")]) { | ||
| // from project.moduleDir | ||
| // into project.moduleShimsDir | ||
| // include "**/*.bss" | ||
| // } | ||
| // processShimsResources.dependsOn(copyShimBssTask) | ||
|
|
||
| addMavenPublication(project, [ 'graphics' , 'controls']) | ||
|
|
||
| addValidateSourceSets(project, sourceSets) | ||
| } | ||
|
|
||
| project(":swing") { | ||
|
|
||
| // We need to skip setting compiler.options.release for this module, | ||
|
|
@@ -3911,7 +4086,17 @@ project(":systemTests") { | |
| testImplementation project(":swing").sourceSets.test.output | ||
| } | ||
|
|
||
| def dependentProjects = [ | ||
| 'base', | ||
| 'graphics', | ||
| 'controls', | ||
| 'incubator.input', | ||
| 'incubator.richtext', | ||
| 'media', | ||
| 'web', | ||
| 'swing', | ||
| 'fxml' | ||
| ] | ||
| commonModuleSetup(project, dependentProjects) | ||
|
|
||
| File testJavaPolicyFile = new File(rootProject.buildDir, TESTJAVAPOLICYFILE); | ||
|
|
@@ -4351,7 +4536,10 @@ task javadoc(type: Javadoc, dependsOn: createMSPfile) { | |
| description = "Generates the JavaDoc for all the public API" | ||
| executable = JAVADOC | ||
| def projectsToDocument = [ | ||
| project(":base"), project(":graphics"), project(":controls"), | ||
| project(":incubator.input"), | ||
| project(":incubator.richtext"), | ||
| project(":media"), | ||
| project(":swing"), /*project(":swt"),*/ project(":fxml"), project(":web")] | ||
| source(projectsToDocument.collect({ | ||
| [it.sourceSets.main.java] | ||
|
|
@@ -5675,6 +5863,7 @@ compileTargets { t -> | |
| def modnames = [] | ||
| moduleProjList.each { project -> | ||
| if (project.hasProperty("moduleName") && project.buildModule) { | ||
| def incubating = project.hasProperty("incubating") && project.ext.incubating | ||
|
There was a problem hiding this comment. After the merge of master, you can remove this (it is unused). I removed it from the PR #1616 (Support JavaFX incubator modules). There was a problem hiding this comment. I plan to update (merge) the build script once #1616 is integrated. There was a problem hiding this comment. This is still an issue after the merge, and needs to now be removed. There was a problem hiding this comment. missed this spot, thanks! |
||
| modnames << project.ext.moduleName | ||
| File dir; | ||
| if (project.sourceSets.hasProperty('shims')) { | ||
|
|
@@ -5686,16 +5875,18 @@ compileTargets { t -> | |
| def dstModuleDir = cygpath(dir.path) | ||
| modpath << "${dstModuleDir}" | ||
|
|
||
| if (!incubating) { | ||
| String themod = dir.toURI() | ||
| testJavaPolicyFile << "grant codeBase \"${themod}\" {\n" + | ||
| " permission java.security.AllPermission;\n" + | ||
| "};\n" | ||
|
|
||
| dir = new File(rootProject.buildDir, "sdk/lib/${project.ext.moduleName}.jar") | ||
| themod = dir.toURI() | ||
| runJavaPolicyFile << "grant codeBase \"${themod}\" {\n" + | ||
| " permission java.security.AllPermission;\n" + | ||
| "};\n" | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -5741,6 +5932,8 @@ compileTargets { t -> | |
| def jmodName = "${moduleName}.jmod" | ||
| def jmodFile = "${jmodsDir}/${jmodName}" | ||
|
|
||
| def incubating = project.hasProperty("incubating") && project.ext.incubating | ||
|
|
||
| // On Windows, copy the native libraries in the jmod image | ||
| // to a "javafx" subdir to avoid conflicting with the Microsoft | ||
| // DLLs that are shipped with the JDK | ||
|
|
@@ -5782,6 +5975,10 @@ compileTargets { t -> | |
| if (sourceDateEpoch != null) { | ||
| args("--date", extendedTimestamp) | ||
| } | ||
| if (incubating) { | ||
| args("--do-not-resolve-by-default") | ||
| args("--warn-if-resolved=incubating") | ||
| } | ||
| args(jmodFile) | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I recommend deleting this commented-out block unless you plan to deliver resources as part of the
jfx.incubator.inputmodule.