diff --git a/docs/releasing.md b/docs/releasing.md index adee9bd1..6d77e89d 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -116,11 +116,12 @@ to the target triple, so host build scripts aren't affected. candidates replace each other. - Double-clicking the MSI opens a setup wizard (WixUI_InstallDir without the licence page): Welcome, install folder (remembered for upgrades in `HKLM\Software\VectorCraft\InstallDir`), - Ready, a progress page, and a Finish page that says where to find the app, with a ticked "Launch - VectorCraft" box. The pages name the full version (`vectorcraft.en-us.wxl`). `package.ps1` draws - the wizard's banner and side bitmaps from the app icon, so no WiX stock art ships. `msiexec /qn` - still installs silently. Building needs the WiX UI and Util extensions: - `wix extension add -g WixToolset.UI.wixext/5.0.2 WixToolset.Util.wixext/5.0.2`. + Shortcuts (a ticked "Create a desktop shortcut" box), Ready, a progress page, and a Finish page + that says where to find the app, with a ticked "Launch VectorCraft" box. The pages name the full + version (`vectorcraft.en-us.wxl`). `package.ps1` draws the wizard's banner and side bitmaps from + the app icon, so no WiX stock art ships. `msiexec /qn` still installs silently, with the desktop + shortcut unless `INSTALLDESKTOPSHORTCUT=""` is passed. Building needs the WiX UI and Util + extensions: `wix extension add -g WixToolset.UI.wixext/5.0.2 WixToolset.Util.wixext/5.0.2`. - The ARM64 build is cross-compiled on the x64 runner. `.github/workflows/windows-arm64.yml` installs that MSI on a Windows 11 ARM64 runner, checks that both installed programs are ARM64, runs `vectorcraft-cli --version` natively and uninstalls. diff --git a/packaging/windows/vectorcraft.en-us.wxl b/packaging/windows/vectorcraft.en-us.wxl index c064e56d..353499d7 100644 --- a/packaging/windows/vectorcraft.en-us.wxl +++ b/packaging/windows/vectorcraft.en-us.wxl @@ -7,5 +7,9 @@ + + + + diff --git a/packaging/windows/vectorcraft.wxs b/packaging/windows/vectorcraft.wxs index 338ee1f6..2331306f 100644 --- a/packaging/windows/vectorcraft.wxs +++ b/packaging/windows/vectorcraft.wxs @@ -10,7 +10,9 @@ Per-machine install with a setup wizard that names the version: Welcome, install folder (Program Files\VectorCraft by default, remembered for upgrades), Ready, a progress page, and a Finish page with a ticked "Launch VectorCraft" box. Installs a Start Menu shortcut and an App Paths entry (so `vectorcraft` - starts from the Run dialog), plus vectorcraft-cli. `msiexec /qn` still installs silently. + starts from the Run dialog), plus vectorcraft-cli. A Shortcuts page after the install folder offers + a desktop shortcut (ticked). `msiexec /qn` still installs silently, with the desktop shortcut + unless INSTALLDESKTOPSHORTCUT="" is passed. --> @@ -39,6 +41,7 @@ + @@ -47,14 +50,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,5 +124,13 @@ + + + + + +