Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8343196: Add build property to identify experimental builds of JavaFX #1637

Closed
wants to merge 6 commits into from
Closed

8343196: Add build property to identify experimental builds of JavaFX #1637

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
355dec5
8343196: Add build property to identify experimental builds of JavaFX
arapte Nov 14, 2024
c3395cc
Merge branch 'master' into exp-suffix
arapte Nov 15, 2024
e275089
review comments
arapte Nov 18, 2024
ee7b69b
change property name to jfx.experimental.feature.name
arapte Nov 18, 2024
bbe492a
correcttion
arapte Nov 18, 2024
26e7790
Update build.gradle
arapte Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,16 @@ 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 {
relSuffix = jfxExperimentalFeatureName != "" ?
"-${jfxExperimentalFeatureName}" : jfxReleaseSuffix;
relOpt = "-${buildTimestamp}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will unconditionally add a timestamp to all EA builds of JavaFX, not just experimental builds. Changing the version string for EA builds seems out of scope for this PR.

Suggested change
relSuffix = jfxExperimentalFeatureName != "" ?
"-${jfxExperimentalFeatureName}" : jfxReleaseSuffix;
relOpt = "-${buildTimestamp}"
if (jfxExperimentalFeatureName != "") {
relSuffix = "-${jfxExperimentalFeatureName}"
relOpt = "-${buildTimestamp}"
} else {
relSuffix = jfxReleaseSuffix
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kevinrushforth , Included the change.

}
}
defineProperty("RELEASE_SUFFIX", relSuffix)
defineProperty("RELEASE_VERSION_SHORT", "${RELEASE_VERSION}${RELEASE_SUFFIX}")
Expand Down
5 changes: 5 additions & 0 deletions build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down