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

Windows portable zip/MSI package builds #358

Merged
merged 90 commits into from
Jun 22, 2021

Conversation

someone--else
Copy link
Contributor

MSIX thing didn't work out (too much work to support backward compatibility for little benefit); MSI should support Windows 7 to 10 and is built via open-source WiX tool

Portable ZIP and MSI packages include all required GTK binaries and icons/themes (there isn't an easy way to install these on Windows without MSYS/MinGW). Licenses for GTK and dependent libraries are also included in the license subdir of the installation folder, but not in the MSI package license dialog - if they should be, source text is at glscopeclient/wix/LICENSE.rtf (yes MSI/WiX don't support plain text licenses)

@someone--else
Copy link
Contributor Author

Built portable ZIP/MSI packages can be downloaded from here: https://github.com/someone--else/scopehal-apps/actions/runs/865264938
(MSI is zipped because GitHub Actions)

@someone--else
Copy link
Contributor Author

someone--else commented May 21, 2021

Fixes #348

@someone--else someone--else changed the title Windows portable zip/MSI package builds Windows portable zip/MSI package builds #348 May 21, 2021
@someone--else someone--else changed the title Windows portable zip/MSI package builds #348 Windows portable zip/MSI package builds May 21, 2021
@azonenberg azonenberg linked an issue May 22, 2021 that may be closed by this pull request
@azonenberg
Copy link
Collaborator

Please include all dependency licenses in the license.rtf file. Looks good at a glance otherwise although I need to test a bit more thoroughly before merging.

@someone--else
Copy link
Contributor Author

Added dependency licenses to LICENSE.rtf; although it's not very clear what license applies to what file since it's just a concatenation of all relevant license files. Not sure how it should be structured to reflect that

@azonenberg
Copy link
Collaborator

Added dependency licenses to LICENSE.rtf; although it's not very clear what license applies to what file since it's just a concatenation of all relevant license files. Not sure how it should be structured to reflect that

I'm thinking one heading per unique license (no need to include e.g. the LGPL more than once) that specifies what particular binaries/directories are covered under it.

@someone--else
Copy link
Contributor Author

Looked at a few cases and often license texts are customized with at least different copyright strings. Not sure it would be entirely correct to delete that

@someone--else
Copy link
Contributor Author

There's also an option of deleting the license dialog from the installer entirely; might be acceptable since portable zip package doesn't have one either

@@ -166,6 +166,7 @@ jobs:
cmake \
-G"MSYS Makefiles" \
-DBUILD_TESTING=OFF \
-DWIXPATH="C:/Program Files (x86)/WiX Toolset v3.11/bin" \
Copy link
Contributor

Choose a reason for hiding this comment

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

When rebasing, you need to generate a new job for this build. The existing Build step generates a package to be used on MSYS2. This one generates a package to be used outside. Yet, if the WIX packaging can be built based on an MSYS2 *.zst package, we might avoid rebuilding.

BTW, note that you are executing these commands on an MSYS2 shell. Hence, you can use -DWIXPATH='/c/Program Files (x86)/Wix Toolset v3.11/bin'.

@azonenberg
Copy link
Collaborator

Looks like we've got some merge conflicts to take care of still. I think all of the recent Windows build failures have been resolved. Anything needed on my end to help this proceed?

Anatol Ulrich and others added 27 commits June 21, 2021 22:11
This was updated for MacOS a while ago but that broke mingw/windows
These were missed due to already failing CI
@someone--else
Copy link
Contributor Author

Rebased to the current master branch; resulting build (https://github.com/someone--else/scopehal-apps/actions/runs/958775342) generates fully functional zip and MSI packages

@azonenberg azonenberg merged commit 0308578 into ngscopeclient:master Jun 22, 2021
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.

Create Windows install packaging
7 participants