Skip to content

Commit 819952a

Browse files
mstr2mstr2
committed
Merge branch 'master' into fixes/css-initial-value
2 parents 261da3b + 001f292 commit 819952a

File tree

310 files changed

+6949
-8149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+6949
-8149
lines changed

‎.github/workflows/submit.yml

+16-12
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ jobs:
7676
BOOT_JDK_VERSION: "23"
7777
BOOT_JDK_FILENAME: "jdk-23_linux-x64_bin.tar.gz"
7878
BOOT_JDK_URL: "https://download.oracle.com/java/23/archive/jdk-23_linux-x64_bin.tar.gz"
79-
ANT_DIR: "apache-ant-1.10.5"
80-
ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
81-
ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"
79+
# ANT_DIR: "apache-ant-1.10.5"
80+
# ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
81+
# ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"
8282

8383
steps:
8484
- name: Checkout the source
@@ -90,11 +90,11 @@ jobs:
9090
run: |
9191
set -x
9292
sudo apt-get update
93-
sudo apt-get install libgl1-mesa-dev libx11-dev libxxf86vm-dev libxt-dev pkg-config libgtk2.0-dev libgtk-3-dev libxtst-dev gcc-13 g++-13
93+
sudo apt-get install ant libgl1-mesa-dev libx11-dev libxxf86vm-dev libxt-dev pkg-config libgtk2.0-dev libgtk-3-dev libxtst-dev gcc-13 g++-13
9494
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13
9595
mkdir -p "${HOME}/build-tools"
96-
wget -O "${HOME}/build-tools/${ANT_FILENAME}" "${ANT_URL}"
97-
tar -zxf "${HOME}/build-tools/${ANT_FILENAME}" -C "${HOME}/build-tools"
96+
# wget -O "${HOME}/build-tools/${ANT_FILENAME}" "${ANT_URL}"
97+
# tar -zxf "${HOME}/build-tools/${ANT_FILENAME}" -C "${HOME}/build-tools"
9898
9999
# FIXME: enable cache for boot JDK
100100
# - name: Restore boot JDK from cache
@@ -118,9 +118,10 @@ jobs:
118118
set -x
119119
export JAVA_HOME="${HOME}/bootjdk/jdk-${BOOT_JDK_VERSION}"
120120
echo "JAVA_HOME=${JAVA_HOME}" >> "${GITHUB_ENV}"
121-
export ANT_HOME="${HOME}/build-tools/${ANT_DIR}"
122-
echo "ANT_HOME=${ANT_HOME}" >> "${GITHUB_ENV}"
123-
export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
121+
# export ANT_HOME="${HOME}/build-tools/${ANT_DIR}"
122+
# echo "ANT_HOME=${ANT_HOME}" >> "${GITHUB_ENV}"
123+
# export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
124+
export PATH="$JAVA_HOME/bin:$PATH"
124125
env | sort
125126
which java
126127
java -version
@@ -132,15 +133,17 @@ jobs:
132133
working-directory: jfx
133134
run: |
134135
set -x
135-
export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
136+
# export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
137+
export PATH="$JAVA_HOME/bin:$PATH"
136138
bash gradlew -version
137139
bash gradlew --info all
138140
139141
- name: Run JavaFX headless tests
140142
working-directory: jfx
141143
run: |
142144
set -x
143-
export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
145+
# export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
146+
export PATH="$JAVA_HOME/bin:$PATH"
144147
bash gradlew --info --continue -PTEST_ONLY=true test -x :web:test
145148
146149
@@ -295,7 +298,8 @@ jobs:
295298
java -version
296299
which ant
297300
ant -version
298-
sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
301+
# We want to use Xcode 14, but GHA removed it from the macOS 14 runners
302+
# sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
299303
xcodebuild -version
300304
301305
- name: Build JavaFX artifacts

‎build.gradle

+13-60
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,9 @@ ext.BUILD_CLOSED = buildClosed
336336

337337
ext.RUNARGSFILE = "run.args"
338338
ext.COMPILEARGSFILE = "compile.args"
339-
ext.RUNJAVAPOLICYFILE = 'run.java.policy'
340339

341340
ext.TESTCOMPILEARGSFILE = "testcompile.args"
342341
ext.TESTRUNARGSFILE = "testrun.args"
343-
ext.TESTJAVAPOLICYFILE = 'test.java.policy'
344342

345343
// the file containing "extra" --add-exports
346344
ext.EXTRAADDEXPORTS = 'buildSrc/addExports'
@@ -697,7 +695,19 @@ if (HUDSON_JOB_NAME == "not_hudson") {
697695
relSuffix = "-internal"
698696
relOpt = "-${buildTimestamp}"
699697
} else {
700-
relSuffix = IS_MILESTONE_FCS ? "" : jfxReleaseSuffix
698+
if (IS_MILESTONE_FCS) {
699+
if (jfxExperimentalFeatureName != "") {
700+
fail("An experimental feature branch should not be used for FCS build")
701+
}
702+
relSuffix = ""
703+
} else {
704+
if (jfxExperimentalFeatureName != "") {
705+
relSuffix = "-${jfxExperimentalFeatureName}"
706+
relOpt = "-${buildTimestamp}"
707+
} else {
708+
relSuffix = jfxReleaseSuffix
709+
}
710+
}
701711
}
702712
defineProperty("RELEASE_SUFFIX", relSuffix)
703713
defineProperty("RELEASE_VERSION_SHORT", "${RELEASE_VERSION}${RELEASE_SUFFIX}")
@@ -3791,7 +3801,6 @@ project(":web") {
37913801
dependsOn testWebArchiveJar
37923802
def testResourceDir = file("$buildDir/testing/resources")
37933803
jvmArgs "-DWEB_ARCHIVE_JAR_TEST_DIR=$testResourceDir"
3794-
systemProperty 'java.security.manager', 'allow'
37953804
}
37963805

37973806
task compileJavaDOMBinding()
@@ -4033,7 +4042,6 @@ project(":systemTests") {
40334042
def dependentProjects = [ 'base', 'graphics', 'controls', 'media', 'jsobject', 'web', 'swing', 'fxml' ]
40344043
commonModuleSetup(project, dependentProjects)
40354044

4036-
File testJavaPolicyFile = new File(rootProject.buildDir, TESTJAVAPOLICYFILE);
40374045
File testRunArgsFile = new File(rootProject.buildDir,TESTRUNARGSFILE);
40384046

40394047
File stRunArgsFile = new File(project.buildDir,"st.run.args");
@@ -4184,15 +4192,12 @@ project(":systemTests") {
41844192
if (project.hasProperty("launcherModulePath")) {
41854193
systemProperties 'worker.module.path': launcherModulePath
41864194
}
4187-
systemProperties 'worker.patch.policy': cygpath(testJavaPolicyFile.path)
41884195
systemProperties 'worker.java.cmd': JAVA
41894196

41904197
if (rootProject.hasProperty("ClipShapeTest.numTests")) {
41914198
systemProperty "ClipShapeTest.numTests", rootProject.getProperty("ClipShapeTest.numTests")
41924199
}
41934200

4194-
systemProperty 'java.security.manager', 'allow'
4195-
41964201
if (!IS_USE_ROBOT) {
41974202
// Disable all robot-based visual tests
41984203
exclude("test/robot/**");
@@ -4976,18 +4981,6 @@ compileTargets { t ->
49764981
outputs.file(f)
49774982
}
49784983

4979-
def outputPolicyDir = "${modulesConfDir}/java.base/security"
4980-
def outputPolicyFile = file("${outputPolicyDir}/java.policy.extra")
4981-
4982-
outputs.file(outputPolicyFile)
4983-
moduleProjList.each { project ->
4984-
def policyDir = "${project.projectDir}/src/main/conf/security"
4985-
def policyFile = file("${policyDir}/java.policy")
4986-
if (policyFile.exists()) {
4987-
inputs.file(policyFile)
4988-
}
4989-
}
4990-
49914984
doLast {
49924985
Map extras = [:]
49934986

@@ -5031,16 +5024,6 @@ compileTargets { t ->
50315024
f << "\n"
50325025
}
50335026
}
5034-
5035-
// concatecate java.policy files into a single file
5036-
//
5037-
mkdir outputPolicyDir
5038-
outputPolicyFile.delete()
5039-
moduleProjList.each { project ->
5040-
def policyDir = "${project.projectDir}/src/main/conf/security"
5041-
def policyFile = file("${policyDir}/java.policy")
5042-
if (policyFile.exists()) outputPolicyFile << policyFile.text
5043-
}
50445027
}
50455028
}
50465029
buildModules.dependsOn(buildModulesTask)
@@ -5777,15 +5760,9 @@ compileTargets { t ->
57775760
File testRunArgsFile = new File(rootProject.buildDir, TESTRUNARGSFILE)
57785761
//test (shimed) version
57795762
File testCompileArgsFile = new File(rootProject.buildDir, TESTCOMPILEARGSFILE)
5780-
// And a test java.policy file
5781-
File testJavaPolicyFile = new File(rootProject.buildDir, TESTJAVAPOLICYFILE)
5782-
// and the non-test version to go with run.args
5783-
File runJavaPolicyFile = new File(rootProject.buildDir, RUNJAVAPOLICYFILE);
57845763

57855764
outputs.file(testRunArgsFile)
57865765
outputs.file(testCompileArgsFile)
5787-
outputs.file(testJavaPolicyFile)
5788-
outputs.file(runJavaPolicyFile)
57895766
inputs.file(EXTRAADDEXPORTS);
57905767

57915768
doLast() {
@@ -5801,9 +5778,6 @@ compileTargets { t ->
58015778
testRunArgsFile.delete()
58025779
testCompileArgsFile.delete()
58035780

5804-
testJavaPolicyFile.delete()
5805-
runJavaPolicyFile.delete()
5806-
58075781
List<String> modpath = []
58085782

58095783
if (HAS_JAVAFX_MODULES) {
@@ -5819,16 +5793,6 @@ compileTargets { t ->
58195793
def dstModuleDir = cygpath(dir.path)
58205794
modpath << "${project.ext.moduleName}=${dstModuleDir}"
58215795

5822-
String themod = dir.toURI()
5823-
testJavaPolicyFile << "grant codeBase \"${themod}\" {\n" +
5824-
" permission java.security.AllPermission;\n" +
5825-
"};\n"
5826-
5827-
dir = new File(rootProject.buildDir, "modular-sdk/modules/${project.ext.moduleName}")
5828-
themod = dir.toURI()
5829-
runJavaPolicyFile << "grant codeBase \"${themod}\" {\n" +
5830-
" permission java.security.AllPermission;\n" +
5831-
"};\n"
58325796
}
58335797
}
58345798

@@ -5853,17 +5817,6 @@ compileTargets { t ->
58535817

58545818
def dstModuleDir = cygpath(dir.path)
58555819
modpath << "${dstModuleDir}"
5856-
5857-
String themod = dir.toURI()
5858-
testJavaPolicyFile << "grant codeBase \"${themod}\" {\n" +
5859-
" permission java.security.AllPermission;\n" +
5860-
"};\n"
5861-
5862-
dir = new File(TEST_SDK_PATH, "sdk/lib/${project.ext.moduleName}.jar")
5863-
themod = dir.toURI()
5864-
runJavaPolicyFile << "grant codeBase \"${themod}\" {\n" +
5865-
" permission java.security.AllPermission;\n" +
5866-
"};\n"
58675820
}
58685821
}
58695822

‎build.properties

+5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
# will cause the suffix to become blank.
3939
jfx.release.suffix=-ea
4040

41+
# Set this property to the name of the experimental feature for your branch in sandbox.
42+
# Do not include a dash in the name. For example, if you have a sandbox branch
43+
# named myfeature you might set jfx.experimental.feature.name=myfeature
44+
jfx.experimental.feature.name=
45+
4146
# UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
4247
jfx.release.major.version=24
4348
jfx.release.minor.version=0

‎modules/javafx.base/src/main/conf/security/java.policy

-4
This file was deleted.

‎modules/javafx.base/src/main/java/com/sun/javafx/FXPermissions.java

-63
This file was deleted.

0 commit comments

Comments
 (0)