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

Add support for Windows binary meta information and fix WiX installer… #371

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

KaiKorla
Copy link
Contributor

@KaiKorla KaiKorla commented May 7, 2024

This PR add support for getting the Windows binary meta information in line with the release version and some other information. Also it updates the WiX installer description to have to correct release version also.

To achieve this i added two build dependencies:

  • windows_exe_info = "0.4"
  • cargo-edit = "0.12"

Tell me what you think.

image

wix/main.wxs Outdated
Version='0.0.{{ VERSION }}'>
Version='{{ VERSION }}.0.0'>
Copy link
Member

Choose a reason for hiding this comment

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

I am not the big Windows user, but noticed that I have apps with different version notations.
Surely there must be a way for us to do yyyy.count like we do everywhere else? I just recall adding 0.0.{{ VERSION }} because otherwise WiX would fail to compile 🤔

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea, well it is an Windows Installer SDK limitation (which is, IMHO, bad). That means that the Windows version will be always differ from the version in the VERSION file, as the major version must be less than 256. :-(

I will change the PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To be more precise it seems a WiX 3 limitation. The Windows Installer SDK itself defines version as documented here. I made a brief attempt with WiX 5 and it seems that there is a warning if the version is "2004.7" and no error. Is it an option to rewrite the WiX description and migrate to WiX 5? I could make this.

Copy link
Member

Choose a reason for hiding this comment

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

To be more precise it seems a WiX 3 limitation. The Windows Installer SDK itself defines version as documented here. I made a brief attempt with WiX 5 and it seems that there is a warning if the version is "2004.7" and no error. Is it an option to rewrite the WiX description and migrate to WiX 5? I could make this.

You are VERY welcome to do that!

@@ -4,8 +4,10 @@
#!/bin/bash
EXE_NAME="halloy.exe"
TARGET="x86_64-pc-windows-msvc"
VERSION=$(cat VERSION).0
Copy link
Member

Choose a reason for hiding this comment

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

We should keep Product version and File version equal imho.
And preferably both stick to our normal schematics.

With above they turn into:

File version: Y.X.0.0
Product version: Y.X.0

@casperstorm
Copy link
Member

Note @KaiKorla that i just modified the Wix file slightly after #363 was merged.

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.

None yet

2 participants