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

desktop: Add a windows .msi installer #17335

Merged
merged 5 commits into from
Aug 6, 2024

Conversation

Dinnerbone
Copy link
Contributor

this was awful. xml and barely documented schemas... 😭

But this makes an msi as part of the nightly release, which installs ruffle and hints at a file association with swfs.

(It's a hint because windows will likely choose to ignore it if the user already has an association - best case it'll ask the user what they want as their default, the next time they open a swf)

I haven't actually tested the action changes on github, just locally 😓 Hard to test.

@Dinnerbone
Copy link
Contributor Author

ruffle.zip
This is the current master, if anyone wants to try it out.

@danielhjacobs
Copy link
Contributor

As discussed on Discord, this installer should probably add a Ruffle shortcut. It can be added to either or both of the Desktop and the Start Menu, but I expect most people will want it to be on the Desktop.

.github/workflows/release_nightly.yml Outdated Show resolved Hide resolved
.github/workflows/release_nightly.yml Show resolved Hide resolved
@@ -1,4 +1,5 @@
// winres.h cannot be included, so define manually
#define VS_VERSION_INFO 1
Copy link
Member

Choose a reason for hiding this comment

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

I'm wondering about these version-related strings in this file (VER_FILEVERSION, VER_PRODUCTVERSION). Are they important? If they are, we should probably set them dynamically based on the version from cargo somehow?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes we should! They're not critical by any means, but it's good practice to set them. It's the windows equivalent of tools giving --version as a standard CLI argument.

Copy link
Member

Choose a reason for hiding this comment

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

I guess we could set them dynamically in build.rs then. It seems that we can use the macros parameter for that, however I'm unsure how that works and I wasn't able to find any examples. We should also consider parameterizing VER_DEBUG and possibly the year.

@Croworbit
Copy link

I don't really like stuff on my desktop, I assume the shortcut is optional?

@Dinnerbone
Copy link
Contributor Author

Dinnerbone commented Aug 2, 2024

Updated to add shortcuts, remove EULA screen, added a readme for how to build, and moved to desktop/packages/windows/wix.
ruffle.zip

I don't really like stuff on my desktop, I assume the shortcut is optional?

Unfortunately it's really hard to make optional... :( Can delete it immediately, it won't recreate it.

@Croworbit
Copy link

just for the record, that stinks.
but depending on the installer creation tool you're using, its probably painful and old, so fair enough

would it reappear at any time during an update, or is it only on first install?

Copy link
Member

@kjarosh kjarosh left a comment

Choose a reason for hiding this comment

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

LGTM, although note that I'm not able to test this and I do not have extensive knowledge about Windows applications

<?endif?>

<Package
Name='Ruffle'
Copy link
Member

Choose a reason for hiding this comment

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

Just a nitpick: there are mixed apostrophes (' vs "), we should probably use " everywhere.

desktop/packages/windows/wix/ruffle.wxs Outdated Show resolved Hide resolved
desktop/packages/windows/wix/ruffle.wxs Outdated Show resolved Hide resolved
@Dinnerbone
Copy link
Contributor Author

Made the desktop shortcut optional, and fixed the mime type & feature description

@Dinnerbone Dinnerbone enabled auto-merge (rebase) August 6, 2024 20:11
@Dinnerbone Dinnerbone merged commit 3357904 into ruffle-rs:master Aug 6, 2024
16 of 17 checks passed
@Croworbit
Copy link

Made the desktop shortcut optional, and fixed the mime type & feature description

I appreciate this
sorry about the whining

@n0samu n0samu added A-desktop Area: Desktop Application windows Windows-specific issues newsworthy labels Aug 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-desktop Area: Desktop Application newsworthy windows Windows-specific issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants