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.

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

Fix Win resource FILEVERSION #40752

Merged
merged 1 commit into from
May 8, 2021
Merged

Fix Win resource FILEVERSION #40752

merged 1 commit into from
May 8, 2021

Conversation

musm
Copy link
Contributor

@musm musm commented May 8, 2021

Fixes #40739

Seems like a bug in the Makefile, where the existing code would convert 1.6.1 --> to 1.6.0.1 in the exe

From https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource

FILEVERSION version | Binary version number for the file. The version consists of two 32-bit integers, defined by four 16-bit integers. For example, "FILEVERSION 3,10,0,61" is translated into two doublewords: 0x0003000a and 0x0000003d, in that order. Therefore, if version is defined by the DWORD values dw1 and dw2, they need to appear in the FILEVERSION statement as follows: HIWORD(dw1), LOWORD(dw1), HIWORD(dw2), LOWORD(dw2).

Copy link
Sponsor Member

@vtjnash vtjnash left a comment

Choose a reason for hiding this comment

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

Yeah, I think this was based on a misunderstanding. The parts are named major/minor/build/revision, and we'd mapped patch -> revision

@musm
Copy link
Contributor Author

musm commented May 8, 2021

I also figure that it's simply not worth the hassle to add the revision/build number after the patch number, since it would unnecessarily complicate the build script

@musm musm added the backport 1.6 Change should be backported to release-1.6 label May 8, 2021
@musm musm merged commit 27d3931 into JuliaLang:master May 8, 2021
@musm musm deleted the winver branch May 9, 2021 01:46
antoine-levitt pushed a commit to antoine-levitt/julia that referenced this pull request May 9, 2021
KristofferC pushed a commit that referenced this pull request May 11, 2021
@KristofferC KristofferC mentioned this pull request May 11, 2021
45 tasks
shirodkara pushed a commit to shirodkara/julia that referenced this pull request Jun 9, 2021
johanmon pushed a commit to johanmon/julia that referenced this pull request Jul 5, 2021
@KristofferC KristofferC removed the backport 1.6 Change should be backported to release-1.6 label Jul 12, 2021
staticfloat pushed a commit that referenced this pull request Dec 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Version numbers in Windows binaries are incorrect
3 participants