Fix MSI support and add minimal UI #142
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aerkiaga
commented
May 26, 2023
| @@ -158,6 +171,7 @@ fn set_summary_info(package: &mut Package, package_guid: Uuid, settings: &Settin | |||
| } | |||
| let creating_app = format!("cargo-bundle v{}", crate_version!()); | |||
| summary_info.set_creating_application(creating_app); | |||
| summary_info.set_word_count(2); | |||
There was a problem hiding this comment.
This fix requires the rust-msi patch. Without this line, the installer will attempt to copy files from outside the package.
aerkiaga
commented
May 26, 2023
| @@ -429,9 +464,9 @@ fn create_feature_table(package: &mut Package, settings: &Settings) -> crate::Re | |||
| msi::Value::from(settings.bundle_name()), | |||
| msi::Value::Null, | |||
| msi::Value::Int(1), | |||
| msi::Value::Int(3), | |||
| msi::Value::Int(1), | |||
There was a problem hiding this comment.
With Feature Level 3 and INSTALLLEVEL 1, this feature will never be installed.
aerkiaga
commented
May 26, 2023
| @@ -591,7 +626,7 @@ fn create_file_table(package: &mut Package, cabinets: &[CabinetInfo]) -> crate:: | |||
| for cabinet in cabinets.iter() { | |||
| for resource in cabinet.resources.iter() { | |||
| rows.push(vec
|
This looks reasonable to me. I've just published a v0.6.0 of the msi crate with the new |
|
Looks like just need to fix some clippy errors. |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request gets MSI support to a state where it can install and uninstall a simple program (under Wine). It also adds a simple setup UI with support for both install and remove actions. It cannot yet upgrade an installation in-place or perform other tasks like setting up shortcuts, modifying environment variables or writing registry values.
Depends on mdsteele/rust-msi#16.
The UI layout is inspired on that of an existing installer, with less dialogs/controls and some modifications: the text has been made larger (size 10, up from 8), and all sentences have been reworded, notably some buttons for clarity ("Next" -> "Install"/"Remove", "Yes" -> "Abort", "No" -> "Continue"). Also, no icons or banners are present; unnecessary though they are, I could draw up some (following any indications) to make the installer more closely follow conventional UIs (edit: done here, I'll PR if desired).
Edit: I've commented on the fixes. Everything else is not strictly necessary for the installer to work.