Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update various file and installer properties #6587

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
Merged
dgud merged 5 commits into from
Feb 3, 2023
Merged

Update various file and installer properties #6587

dgud merged 5 commits into from
Feb 3, 2023

Conversation

@lukebakken
Copy link
Contributor

@lukebakken lukebakken commented Dec 20, 2022

Fixes #4232

@lukebakken lukebakken force-pushed the lukebakken/erlang-otp-4232 branch from f3f6a08 to d670436 Compare December 20, 2022 21:53
@github-actions
Copy link
Contributor

github-actions bot commented Dec 20, 2022 •
edited
Loading

CT Test Results

       3 files     125 suites   40m 56s ⏱️
1 501 tests 1 450 ✔️ 51 💤 0 ❌
1 813 runs  1 744 ✔️ 69 💤 0 ❌

Results for commit 5cc0194.

♻️ This comment has been updated with latest results.

To speed up review, make sure that you have read Contributing to Erlang/OTP and that all checks pass.

See the TESTING and DEVELOPMENT HowTo guides for details about how to run test locally.

Artifacts

// Erlang/OTP Github Action Bot

@lukebakken lukebakken marked this pull request as ready for review December 20, 2022 21:57
@lukebakken
Copy link
Contributor Author

lukebakken commented Dec 21, 2022

Hmmm I'm a little surprised that I didn't see these changes in the Windows Installer artifact created by the build. Should I have?

@rickard-green rickard-green added the team:PS Assigned to OTP team PS label Jan 2, 2023
@lukebakken lukebakken force-pushed the lukebakken/erlang-otp-4232 branch from 5a39ad1 to 32f2248 Compare January 4, 2023 14:55
dgud
dgud reviewed Jan 10, 2023
View reviewed changes
@dgud
Copy link
Contributor

dgud commented Jan 10, 2023

I think you should have seen an updated artifact here, strange.

@dgud
Copy link
Contributor

dgud commented Jan 10, 2023

Should probably be rebased to maint branch as well.

@lukebakken lukebakken force-pushed the lukebakken/erlang-otp-4232 branch from 32f2248 to ab1d985 Compare January 10, 2023 15:39
@lukebakken lukebakken force-pushed the lukebakken/erlang-otp-4232 branch from ab1d985 to 9e9f45c Compare January 10, 2023 15:41
@lukebakken lukebakken changed the base branch from master to maint January 10, 2023 15:41
@lukebakken
Copy link
Contributor Author

lukebakken commented Jan 10, 2023

Well, looks like I'm going to finally have to figure out how to build on Windows on my workstation to test these changes out. There must be something preventing the GHA-built installer from reflecting the changes in this PR

dgud added 2 commits January 31, 2023 16:56
@dgud
Limits NSIS versions
eec542d 
We use ExecShellWait.
 NSIS v3.02 added basic support for ExecShellWait.
@dgud
Rename macros
d6c3b02 
So they are named as they should be.
@dgud
Copy link
Contributor

dgud commented Jan 31, 2023

I pushed some fixes that makes it work on my windows machine.
Will do more testing tomorrow.

@lukebakken
Copy link
Contributor Author

lukebakken commented Jan 31, 2023

Thanks @dgud ! I'm still working when I have time on getting my Windows machine able to build Erlang.

dgud added 2 commits February 1, 2023 09:25
@dgud
Use OTP version as product version in installer
964c7b7 
The ProductVersion must be of the format X.X.X.X so we can't use
the release version as ProductVersion.
Use OTP_VERSION instead this also makes sense for the windows
installer as we on windows always delivers a complete OTP.
@dgud
Make copyright year dynamic
5cc0194 
Copyright year inside installer and resource file is NOT automaticly
updated by the release scripts so update them from the makefiles.
@dgud dgud force-pushed the lukebakken/erlang-otp-4232 branch from 89c5b46 to 5cc0194 Compare February 1, 2023 08:26
@dgud
Copy link
Contributor

dgud commented Feb 1, 2023

I re-added the +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${OTP_VERSION}"
and force pushed.
I thought it was not needed since we set the VIProductVersion but I was wrong.
Will add to our daily tests.

@dgud dgud requested a review from rickard-green February 1, 2023 08:30
@dgud dgud mentioned this pull request Feb 1, 2023
Closed
@dgud
Copy link
Contributor

dgud commented Feb 1, 2023

Is #6537 related?

@dgud dgud added the testing currently being tested, tag is used by OTP internal CI label Feb 1, 2023
@lukebakken lukebakken mentioned this pull request Feb 1, 2023
Closed
@lukebakken
Copy link
Contributor Author

lukebakken commented Feb 1, 2023

@dgud I just downloaded the latest Windows installer artifact, and the expected information is present in both the installer and the .exe files that are installed. Thanks!

(cc @inikulshin)

@KennethL KennethL added this to the OTP-26.0-rc1 milestone Feb 2, 2023
@dgud dgud merged commit 00e32c3 into erlang:maint Feb 3, 2023
@lukebakken lukebakken deleted the lukebakken/erlang-otp-4232 branch February 3, 2023 15:57
@lukebakken
Copy link
Contributor Author

lukebakken commented Feb 3, 2023

Thank you @dgud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dgud dgud dgud left review comments

@rickard-green rickard-green Awaiting requested review from rickard-green

Assignees

@dgud dgud

Labels

team:PS Assigned to OTP team PS testing currently being tested, tag is used by OTP internal CI

Projects

None yet

Milestone

OTP-26.0-rc1

Development

Successfully merging this pull request may close these issues.

ERL-1224: Erlang OTP64 EXE Missing Properties

4 participants

@lukebakken @dgud @KennethL @rickard-green