Enable 5 version string components instead of 4 #258
Conversation
|
Dependant on adoptium/temurin-build#2218 Advise merging all three around the same time. Testing this PR here: https://ci.adoptopenjdk.net/view/work-in-progress/job/SXA-create_installer_windows/2/ (Edit: Success! Seeking review and approval on Slack.) Note: Turns out WIX won't build an installer based on a version string with more than four elements. So for now I'm shedding the +[0-9]* build number on the end. This will need to be discussed prior to merge, to find out if the build number is really needed in the installer. |
adamfarley
force-pushed
the
add_seperate_build_and_patch_numbers
branch
from
6a249bd to
eda170d
Compare
adamfarley
force-pushed
the
add_seperate_build_and_patch_numbers
branch
2 times, most recently
from
ef2f1fc to
c2dc24e
Compare
adamfarley
force-pushed
the
add_seperate_build_and_patch_numbers
branch
2 times, most recently
from
bdc243d to
652c16e
Compare
adamfarley
changed the title
| @@ -67,7 +71,7 @@ REM | |||
|
|
|||
| REM Cultures: https://msdn.microsoft.com/de-de/library/ee825488(v=cs.20).aspx | |||
| SET PRODUCT_SKU=OpenJDK | |||
| SET PRODUCT_VERSION=%PRODUCT_MAJOR_VERSION%.%PRODUCT_MINOR_VERSION%.%PRODUCT_MAINTENANCE_VERSION%.%PRODUCT_PATCH_VERSION% | |||
| SET PRODUCT_VERSION=%PRODUCT_MAJOR_VERSION%.%PRODUCT_MINOR_VERSION%.%PRODUCT_MAINTENANCE_VERSION%.%PRODUCT_PATCH_VERSION%.%PRODUCT_BUILD_NUMBER% | |||
There was a problem hiding this comment.
Didn't we must add a "+" or a "b" as "build" here before the PRODUCT_BUILD_NUMBER to stay consitant ..
I think Windows can handle "+" in filename and PRODUCT_VERSION is now only used in msi file name OUTPUT_BASE_FILENAME
There was a problem hiding this comment.
Before this PR, the "PRODUCT_PATCH_VERSION" is actually the build number. It's named wrong, and this PR fixes that.
Adding a plus sign or a "b" is an additional behaviour change.
adamfarley
force-pushed
the
add_seperate_build_and_patch_numbers
branch
from
652c16e to
7b89d72
Compare
Previously, version strings were major.minor.maintenance.patch, where patch was typically the build number. Now, however, we have a fourth element (also named "patch") slotted in right before the existing patch element. So, we're doing four things here: 1) Handling the new patch variable 2) Taking this opportunity to adjust the existing patch variable, in order to (a) prevent the existence of two patch variables, and (b) rename the existing patch variable to "build number", which (since it *is* the build number) seems more appropriate. 3) Allow upstream to pass in an appropriately-shortened version string that wix can use, as anything more than four numbers causes an error. 4) Tidying the litany of IFs in the cmd file. Signed-off-by: Adam Farley <adfarley@redhat.com>
adamfarley
force-pushed
the
add_seperate_build_and_patch_numbers
branch
from
7b89d72 to
247dae0
Compare
Previously, version strings were major.minor.maintenance.patch,
where patch was typically the build number.
Now, however, we have a fourth element (also named "patch")
slotted in right before the existing patch element.
So, we're doing four things here:
order to (a) prevent the existence of two patch variables, and (b)
rename the existing patch variable to "build number", which (since it
is the build number) seems more appropriate.
string that wix can use, as anything more than four numbers causes
an error.
Signed-off-by: Adam Farley adfarley@redhat.com