8343196: Add build property to identify experimental builds of JavaFX

Reviewed-by: kcr, jvos
openjdk · Nov 20, 2024 · 35ff442 · 35ff442 · openjdk-notifier · Nov 20, 2024
1 parent 7d1b2c3
commit 35ff442
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -695,7 +695,19 @@ if (HUDSON_JOB_NAME == "not_hudson") {
     relSuffix = "-internal"
     relOpt = "-${buildTimestamp}"
 } else {
-    relSuffix = IS_MILESTONE_FCS ? "" : jfxReleaseSuffix
+    if (IS_MILESTONE_FCS) {
+        if (jfxExperimentalFeatureName != "") {
+            fail("An experimental feature branch should not be used for FCS build")
+        }
+        relSuffix = ""
+    } else {
+        if (jfxExperimentalFeatureName != "") {
+            relSuffix = "-${jfxExperimentalFeatureName}"
+            relOpt = "-${buildTimestamp}"
+        } else {
+            relSuffix = jfxReleaseSuffix
+        }
+    }
 }
 defineProperty("RELEASE_SUFFIX", relSuffix)
 defineProperty("RELEASE_VERSION_SHORT", "${RELEASE_VERSION}${RELEASE_SUFFIX}")

diff --git a/build.properties b/build.properties
@@ -38,6 +38,11 @@
 # will cause the suffix to become blank.
 jfx.release.suffix=-ea
 
+# Set this property to the name of the experimental feature for your branch in sandbox.
+# Do not include a dash in the name. For example, if you have a sandbox branch
+# named myfeature you might set jfx.experimental.feature.name=myfeature
+jfx.experimental.feature.name=
+
 # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
 jfx.release.major.version=24
 jfx.release.minor.version=0