mirror of
https://github.com/storytold/cadcraft.git
synced 2026-10-24 10:56:51 -06:00
feat(installer): unify Windows setup and completion screens (INSTALLER-UI)
This commit is contained in:
skylartaylor
@@ -145,3 +145,8 @@ Ranked; detail and the full beta checklist in [docs/roadmap.md](docs/roadmap.md)
|
|||||||
## Shared UI workspace integration
|
## Shared UI workspace integration
|
||||||
|
|
||||||
Tool Sets, Layers and Properties use shared docking with persisted layouts, keyboard focus and compact toolbar overflow. No milestone percentage change.
|
Tool Sets, Layers and Properties use shared docking with persisted layouts, keyboard focus and compact toolbar overflow. No milestone percentage change.
|
||||||
|
|
||||||
|
|
||||||
|
### Windows installer unification — release preparation, 2026-10-12
|
||||||
|
|
||||||
|
The shared craft-installer UI preserves this revision's install options and provides persistent installation, repair and Windows Settings removal completion screens. Silent modes stay unattended. Earlier Windows acceptance is recorded in packaging/windows/README.md; normal CI and production-profile upgrade qualification against pinned current releases are in progress. No release or PR has been published.
|
||||||
|
|||||||
@@ -108,3 +108,8 @@ AutoLISP surface, AI features with openly licensed local models, and every remai
|
|||||||
| 2026-10-10 | minor | Merged main: fmt fixed, Ukrainian catalog noted in M13, ready for real work 38% |
|
| 2026-10-10 | minor | Merged main: fmt fixed, Ukrainian catalog noted in M13, ready for real work 38% |
|
||||||
| 2026-10-10 | minor | Alpha gate added (5 core workflows, 4 failing); stage pre-alpha |
|
| 2026-10-10 | minor | Alpha gate added (5 core workflows, 4 failing); stage pre-alpha |
|
||||||
| 2026-10-10 | major | Created from the old ROADMAP's milestone table and current focus; milestones re-scored by depth; beta checklist added |
|
| 2026-10-10 | major | Created from the old ROADMAP's milestone table and current focus; milestones re-scored by depth; beta checklist added |
|
||||||
|
|
||||||
|
|
||||||
|
### Windows installer unification — release preparation, 2026-10-12
|
||||||
|
|
||||||
|
The shared craft-installer UI preserves this revision's install options and provides persistent installation, repair and Windows Settings removal completion screens. Silent modes stay unattended. Earlier Windows acceptance is recorded in packaging/windows/README.md; normal CI and production-profile upgrade qualification against pinned current releases are in progress. No release or PR has been published.
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
# Windows installer UI
|
||||||
|
|
||||||
|
`installer-ui.wxs` is generated from the shared `craft-installer` crate in
|
||||||
|
[craft-libs](https://github.com/storytold/craft-libs/tree/main/crates/installer).
|
||||||
|
`package.ps1` compiles it with this app's package source. The common UI provides progress,
|
||||||
|
repair/remove, and explicit install/uninstall/repair success, cancellation and failure screens.
|
||||||
|
|
||||||
|
Regenerate or check from a sibling craft-libs checkout:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cargo run --locked -p craft-installer -- --write --app cadcraft ../cadcraft/packaging/windows/installer-ui.wxs
|
||||||
|
cargo run --locked -p craft-installer -- --check --app cadcraft ../cadcraft/packaging/windows/installer-ui.wxs
|
||||||
|
```
|
||||||
|
|
||||||
|
Edit the shared templates/profile and regenerate; avoid editing this snapshot by hand. The
|
||||||
|
profile retains this app's existing folder, shortcut and launch options; defaults, persistence,
|
||||||
|
components, associations and signing stay in the app-owned source. Release builds require no
|
||||||
|
sibling checkout, published crate or additional runtime dependency. `/qn`, `/qb` and `/passive`
|
||||||
|
remain unattended and do not launch the app.
|
||||||
|
|
||||||
|
Source/profile checks and native fixture MSI linking/UI table checks passed for x64, x86 and
|
||||||
|
ARM64. All 14 profiles passed full UI install, missing-file repair and cached uninstall, and
|
||||||
|
x86 silent install/removal. Folder upgrades, desktop choices and all six launch profiles also
|
||||||
|
passed their Windows fixture checks. See the
|
||||||
|
[Windows verification record](../../../craft-libs/docs/windows-installer-verification.md) for
|
||||||
|
interactive results, scope validation and remaining acceptance checks with real release payloads.
|
||||||
|
The shared crate includes reusable linking, full UI, option/upgrade/launch and x86 test runners.
|
||||||
|
Windows Settings now uses a separate MSI-owned entry whose uninstall command selects full UI,
|
||||||
|
including the completion screen. Its quiet command and direct `/qn`, `/qb`, `/passive` commands
|
||||||
|
remain unattended. The main feature references `CraftInstallerSettings`; the shared snapshot
|
||||||
|
owns this registration and hides the native MSI entry while retaining MSI repair/upgrade APIs.
|
||||||
|
|
||||||
|
The Settings display name appends `(Craft Apps)` for compatibility with older Launchers; the
|
||||||
|
hidden native MSI name stays unchanged. Existing ARP Modify policy is retained explicitly.
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
CADCraft MSI (WiX Toolset v5: `dotnet tool install -g wix`, plus the WixUI extension:
|
CADCraft MSI (WiX Toolset v5: `dotnet tool install -g wix`, plus the WixUI extension:
|
||||||
`wix extension add -g WixToolset.UI.wixext/5.0.2`). Built by package.ps1:
|
`wix extension add -g WixToolset.UI.wixext/5.0.2`). Built by package.ps1:
|
||||||
|
|
||||||
wix build cadcraft.wxs -arch x64 -ext WixToolset.UI.wixext -d Version=1.2.3 -d BinDir=... -d IconPath=... -o out.msi
|
wix build cadcraft.wxs installer-ui.wxs -arch x64 -ext WixToolset.UI.wixext -d Version=1.2.3 -d BinDir=... -d IconPath=... -o out.msi
|
||||||
|
|
||||||
Per-machine install into Program Files, a Start Menu shortcut, an optional desktop shortcut, and
|
Per-machine install into Program Files, a Start Menu shortcut, an optional desktop shortcut, and
|
||||||
CADCraft offered under "Open with" for .dxf and .dwg drawings (without taking over the user's
|
CADCraft offered under "Open with" for .dxf and .dwg drawings (without taking over the user's
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
<!-- Per-machine (ALLUSERS=1), so this is the all-users (Public) desktop, like the Start Menu above. -->
|
<!-- Per-machine (ALLUSERS=1), so this is the all-users (Public) desktop, like the Start Menu above. -->
|
||||||
<StandardDirectory Id="DesktopFolder" />
|
<StandardDirectory Id="DesktopFolder" />
|
||||||
|
|
||||||
<!-- "Create a desktop shortcut": the wizard's checkbox sets it to 1 (cleared = unset), and
|
<!-- "Create a desktop shortcut": the wizard's checkbox sets it to 1 (unchecked = 0), and
|
||||||
silent installs pass DESKTOPSHORTCUT=1. Secure, so the elevated install sees the UI choice. -->
|
silent installs pass DESKTOPSHORTCUT=1. Secure, so the elevated install sees the UI choice. -->
|
||||||
<Property Id="DESKTOPSHORTCUT" Secure="yes" />
|
<Property Id="DESKTOPSHORTCUT" Secure="yes" />
|
||||||
<!-- The previous install's choice (the shortcut component's HKCU key path, so the installing
|
<!-- The previous install's choice (the shortcut component's HKCU key path, so the installing
|
||||||
@@ -56,11 +56,13 @@
|
|||||||
<SetProperty Id="DESKTOPSHORTCUT" Value="1" After="AppSearch" Sequence="first"
|
<SetProperty Id="DESKTOPSHORTCUT" Value="1" After="AppSearch" Sequence="first"
|
||||||
Condition="NOT DESKTOPSHORTCUT AND PREVIOUSDESKTOPSHORTCUT = "1"" />
|
Condition="NOT DESKTOPSHORTCUT AND PREVIOUSDESKTOPSHORTCUT = "1"" />
|
||||||
|
|
||||||
<UIRef Id="CadcraftUI" />
|
|
||||||
|
|
||||||
<Feature Id="Main" Title="CADCraft" Level="1">
|
<Feature Id="Main" Title="CADCraft" Level="1">
|
||||||
<ComponentGroupRef Id="CadcraftFiles" />
|
<ComponentGroupRef Id="CadcraftFiles" />
|
||||||
|
<ComponentGroupRef Id="CraftInstallerSettings" />
|
||||||
</Feature>
|
</Feature>
|
||||||
|
<Property Id="ARPNOMODIFY" Value="1" />
|
||||||
|
<!-- Shared full UI; app installation policy remains below. -->
|
||||||
|
<UIRef Id="CraftInstallerUI" />
|
||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<Fragment>
|
<Fragment>
|
||||||
@@ -95,73 +97,4 @@
|
|||||||
</Component>
|
</Component>
|
||||||
</ComponentGroup>
|
</ComponentGroup>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
|
|
||||||
<!--
|
|
||||||
Setup wizard: WixUI_InstallDir's flow (WiX v5, ext/UI/wixlib/WixUI_InstallDir.wxs) without the
|
|
||||||
licence and folder pages, plus a Shortcuts page:
|
|
||||||
install: Welcome > Shortcuts > Ready to install > Progress > Finish
|
|
||||||
maintenance: Maintenance welcome > Repair/Remove > Ready > Progress > Finish
|
|
||||||
-->
|
|
||||||
<Fragment>
|
|
||||||
<UI Id="CadcraftUI">
|
|
||||||
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
|
|
||||||
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
|
|
||||||
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
|
|
||||||
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
|
|
||||||
|
|
||||||
<DialogRef Id="DiskCostDlg" />
|
|
||||||
<DialogRef Id="ErrorDlg" />
|
|
||||||
<DialogRef Id="FatalError" />
|
|
||||||
<DialogRef Id="FilesInUse" />
|
|
||||||
<DialogRef Id="MsiRMFilesInUse" />
|
|
||||||
<DialogRef Id="PrepareDlg" />
|
|
||||||
<DialogRef Id="ProgressDlg" />
|
|
||||||
<DialogRef Id="ResumeDlg" />
|
|
||||||
<DialogRef Id="UserExit" />
|
|
||||||
|
|
||||||
<Dialog Id="ShortcutsDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
|
|
||||||
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
|
|
||||||
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
|
|
||||||
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
|
|
||||||
<Publish Event="SpawnDialog" Value="CancelDlg" />
|
|
||||||
</Control>
|
|
||||||
|
|
||||||
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes"
|
|
||||||
Text="Choose where to start [ProductName] from." />
|
|
||||||
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes"
|
|
||||||
Text="{\WixUI_Font_Title}Shortcuts" />
|
|
||||||
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
|
|
||||||
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
|
|
||||||
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
|
|
||||||
|
|
||||||
<Control Id="StartMenuText" Type="Text" X="20" Y="60" Width="330" Height="15" NoPrefix="yes"
|
|
||||||
Text="[ProductName] will be added to the Start menu." />
|
|
||||||
<Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="20" Y="85" Width="330" Height="17"
|
|
||||||
Property="DESKTOPSHORTCUT" CheckBoxValue="1" Text="Create a &desktop shortcut" />
|
|
||||||
</Dialog>
|
|
||||||
|
|
||||||
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
|
|
||||||
|
|
||||||
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="ShortcutsDlg" Condition="NOT Installed" />
|
|
||||||
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
|
|
||||||
|
|
||||||
<Publish Dialog="ShortcutsDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
|
|
||||||
<Publish Dialog="ShortcutsDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" />
|
|
||||||
|
|
||||||
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ShortcutsDlg" Order="1" Condition="NOT Installed" />
|
|
||||||
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
|
|
||||||
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" />
|
|
||||||
|
|
||||||
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
|
|
||||||
|
|
||||||
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
|
|
||||||
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
|
|
||||||
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
|
|
||||||
|
|
||||||
<!-- No "Change" in Apps & features: there is a single feature. -->
|
|
||||||
<Property Id="ARPNOMODIFY" Value="1" />
|
|
||||||
</UI>
|
|
||||||
|
|
||||||
<UIRef Id="WixUI_Common" />
|
|
||||||
</Fragment>
|
|
||||||
</Wix>
|
</Wix>
|
||||||
|
|||||||
@@ -0,0 +1,231 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generated by craft-installer for cadcraft. Edit the template in craft-libs, then regenerate. -->
|
||||||
|
<!-- Adapted from PdfCraft installer-ui.wxs (a6bc63a), GridCraft gridcraft.wxs (5b15827),
|
||||||
|
and EffectCraft installer-ui.wxs (1b4d47f).
|
||||||
|
Copyright (c) 2026 ArtCraft Team and the PdfCraft contributors.
|
||||||
|
Copyright (c) 2026 ArtCraft Team and the GridCraft contributors.
|
||||||
|
Copyright (c) 2026 ArtCraft Team and the EffectCraft contributors.
|
||||||
|
Licensed under MIT OR Apache-2.0; see the repository's LICENSE-MIT and LICENSE-APACHE. -->
|
||||||
|
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||||
|
<Fragment>
|
||||||
|
<!-- Windows Installer populates files-in-use lists at runtime. Keep their table even
|
||||||
|
though these dialogs have no static ListItem rows (the GridCraft UI does the same). -->
|
||||||
|
<EnsureTable Id="ListBox" />
|
||||||
|
<!-- Reuse the existing package icon as a fallback; MSI supplies its standard message icon. -->
|
||||||
|
<Binary Id="CraftInstallerErrorIcon" SourceFile="$(var.IconPath)" />
|
||||||
|
<SetProperty Id="CraftDesktopShortcutChoice" Value="1" Before="InstallWelcome" Sequence="ui"
|
||||||
|
Condition="UILevel = 5 AND NOT Installed AND NOT REMOVE AND NOT REINSTALL AND DESKTOPSHORTCUT = "1"" />
|
||||||
|
|
||||||
|
<UI Id="CraftInstallerUI">
|
||||||
|
<TextStyle Id="CraftInstallerNormal" FaceName="Segoe UI" Size="9" />
|
||||||
|
<TextStyle Id="CraftInstallerTitle" FaceName="Segoe UI" Size="12" Bold="yes" />
|
||||||
|
<Property Id="DefaultUIFont" Value="CraftInstallerNormal" />
|
||||||
|
<Property Id="ErrorDialog" Value="CraftInstallerErrorDlg" />
|
||||||
|
<Dialog Id="CraftInstallerErrorDlg" Width="320" Height="120" Title="[ProductName] Setup" ErrorDialog="yes" NoMinimize="yes">
|
||||||
|
<Control Id="ErrorText" Type="Text" X="60" Y="15" Width="245" Height="65" TabSkip="no" />
|
||||||
|
<Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="32" Height="32" FixedSize="yes" IconSize="32" TabSkip="yes" Text="CraftInstallerErrorIcon" />
|
||||||
|
<Control Id="A" Type="PushButton" X="15" Y="90" Width="65" Height="20" Text="Abort" TabSkip="yes">
|
||||||
|
<Publish Event="EndDialog" Value="ErrorAbort" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="C" Type="PushButton" X="15" Y="90" Width="65" Height="20" Text="Cancel" TabSkip="yes">
|
||||||
|
<Publish Event="EndDialog" Value="ErrorCancel" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="I" Type="PushButton" X="15" Y="90" Width="65" Height="20" Text="Ignore" TabSkip="yes">
|
||||||
|
<Publish Event="EndDialog" Value="ErrorIgnore" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="N" Type="PushButton" X="15" Y="90" Width="65" Height="20" Text="No" TabSkip="yes">
|
||||||
|
<Publish Event="EndDialog" Value="ErrorNo" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="O" Type="PushButton" X="15" Y="90" Width="65" Height="20" Text="OK" TabSkip="yes">
|
||||||
|
<Publish Event="EndDialog" Value="ErrorOk" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="R" Type="PushButton" X="15" Y="90" Width="65" Height="20" Text="Retry" TabSkip="yes">
|
||||||
|
<Publish Event="EndDialog" Value="ErrorRetry" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="Y" Type="PushButton" X="15" Y="90" Width="65" Height="20" Text="Yes" TabSkip="yes">
|
||||||
|
<Publish Event="EndDialog" Value="ErrorYes" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
<Dialog Id="FilesInUse" Width="320" Height="190" Title="[ProductName] Setup" NoMinimize="yes">
|
||||||
|
<Control Id="Description" Type="Text" X="15" Y="15" Width="290" Height="35"
|
||||||
|
Text="Close the applications listed below, then choose Retry. Ignore may require a restart." />
|
||||||
|
<Control Id="Files" Type="ListBox" X="15" Y="55" Width="290" Height="85" Property="FileInUseProcess" />
|
||||||
|
<Control Id="Retry" Type="PushButton" X="95" Y="155" Width="65" Height="20" Default="yes" Text="Retry">
|
||||||
|
<Publish Event="EndDialog" Value="Retry" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="Ignore" Type="PushButton" X="167" Y="155" Width="65" Height="20" Text="Ignore">
|
||||||
|
<Publish Event="EndDialog" Value="Ignore" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="Cancel" Type="PushButton" X="240" Y="155" Width="65" Height="20" Cancel="yes" Text="Cancel">
|
||||||
|
<Publish Event="EndDialog" Value="Exit" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
|
||||||
|
<Dialog Id="InstallWelcome" Width="370" Height="270" Title="[ProductName] Setup">
|
||||||
|
<Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Install [ProductName]" />
|
||||||
|
<Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="40"
|
||||||
|
Text="Setup will install [ProductName] for all users and add it to the Start menu. Click Install to continue." />
|
||||||
|
<Control Id="DesktopShortcut" Type="CheckBox" X="20" Y="125" Width="330" Height="20" Property="CraftDesktopShortcutChoice" CheckBoxValue="1" Text="Create a &desktop shortcut" />
|
||||||
|
<Control Id="Install" Type="PushButton" X="195" Y="235" Width="75" Height="23" Default="yes" ElevationShield="yes" Text="&Install">
|
||||||
|
<Publish Property="DESKTOPSHORTCUT" Value="1" Order="1" Condition="CraftDesktopShortcutChoice = "1"" />
|
||||||
|
<Publish Property="DESKTOPSHORTCUT" Value="0" Order="2" Condition="NOT CraftDesktopShortcutChoice" />
|
||||||
|
<Publish Event="EndDialog" Value="Return" Order="99" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="Cancel" Type="PushButton" X="280" Y="235" Width="70" Height="23" Cancel="yes" Text="Cancel">
|
||||||
|
<Publish Event="EndDialog" Value="Exit" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<Dialog Id="InstallMaintenance" Width="370" Height="270" Title="[ProductName] Setup">
|
||||||
|
<Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Maintain [ProductName]" />
|
||||||
|
<Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70"
|
||||||
|
Text="[ProductName] is already installed. Choose Repair to restore missing files and shortcuts, or Remove to uninstall it." />
|
||||||
|
<Control Id="Repair" Type="PushButton" X="110" Y="235" Width="75" Height="23" Default="yes" ElevationShield="yes" Text="&Repair">
|
||||||
|
<!-- Feature events do not retain REINSTALL/REMOVE in the client UI session. -->
|
||||||
|
<Publish Property="CraftInstallerOperation" Value="repair" Order="1" />
|
||||||
|
<Publish Event="ReinstallMode" Value="amus" Order="2" />
|
||||||
|
<Publish Event="Reinstall" Value="ALL" Order="3" />
|
||||||
|
<Publish Event="EndDialog" Value="Return" Order="4" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="Remove" Type="PushButton" X="195" Y="235" Width="75" Height="23" ElevationShield="yes" Text="R&emove">
|
||||||
|
<Publish Property="CraftInstallerOperation" Value="remove" Order="1" />
|
||||||
|
<Publish Event="Remove" Value="ALL" Order="2" />
|
||||||
|
<Publish Event="EndDialog" Value="Return" Order="3" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="Cancel" Type="PushButton" X="280" Y="235" Width="70" Height="23" Cancel="yes" Text="Cancel">
|
||||||
|
<Publish Event="EndDialog" Value="Exit" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<Dialog Id="InstallProgress" Width="370" Height="270" Title="[ProductName] Setup" Modeless="yes">
|
||||||
|
<Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Setting up [ProductName]" />
|
||||||
|
<!-- No ActionText table is authored: subscribing would blank this message (#305). -->
|
||||||
|
<Control Id="Status" Type="Text" X="20" Y="60" Width="330" Height="40" Text="Please wait while setup completes." />
|
||||||
|
<Control Id="Progress" Type="ProgressBar" X="20" Y="110" Width="330" Height="15" ProgressBlocks="yes">
|
||||||
|
<Subscribe Event="SetProgress" Attribute="Progress" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="Cancel" Type="PushButton" X="280" Y="235" Width="70" Height="23" Cancel="yes" Text="Cancel">
|
||||||
|
<Publish Event="SpawnDialog" Value="ConfirmCancel" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<Dialog Id="ConfirmCancel" Width="300" Height="110" Title="Cancel setup">
|
||||||
|
<Control Id="Description" Type="Text" X="20" Y="20" Width="260" Height="35" Text="Cancel [ProductName] setup?" />
|
||||||
|
<Control Id="Yes" Type="PushButton" X="130" Y="70" Width="70" Height="23" Text="&Yes">
|
||||||
|
<Publish Event="EndDialog" Value="Exit" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="No" Type="PushButton" X="210" Y="70" Width="70" Height="23" Default="yes" Cancel="yes" Text="&No">
|
||||||
|
<Publish Event="EndDialog" Value="Return" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<Dialog Id="InstallComplete" Width="370" Height="270" Title="[ProductName] Setup">
|
||||||
|
<Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Setup completed successfully" HideCondition="REMOVE = "ALL" OR CraftInstallerOperation = "remove"" />
|
||||||
|
<Control Id="RemovedTitle" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Uninstall completed successfully" Hidden="yes" ShowCondition="REMOVE = "ALL" OR CraftInstallerOperation = "remove"" />
|
||||||
|
<Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70"
|
||||||
|
Text="[ProductName] is installed. Open it from the Start menu. Click Finish to close setup." HideCondition="REMOVE = "ALL" OR REINSTALL OR CraftInstallerOperation OR ACTION = "ADMIN"" />
|
||||||
|
<Control Id="Removed" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes"
|
||||||
|
Text="[ProductName] was uninstalled. Your documents and settings were kept. Click Finish to close setup."
|
||||||
|
ShowCondition="REMOVE = "ALL" OR CraftInstallerOperation = "remove"" />
|
||||||
|
<Control Id="Repaired" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes"
|
||||||
|
Text="[ProductName] was repaired. Open it from the Start menu. Click Finish to close setup."
|
||||||
|
ShowCondition="(REINSTALL OR CraftInstallerOperation = "repair") AND NOT REMOVE AND CraftInstallerOperation <> "remove" AND ACTION <> "ADMIN"" />
|
||||||
|
<Control Id="AdminComplete" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes"
|
||||||
|
Text="The administrative image was created. Click Finish to close setup." ShowCondition="ACTION = "ADMIN"" />
|
||||||
|
<Control Id="Finish" Type="PushButton" X="280" Y="235" Width="70" Height="23" Default="yes" Cancel="yes" Text="&Finish">
|
||||||
|
|
||||||
|
<Publish Event="EndDialog" Value="Return" Order="999" />
|
||||||
|
</Control>
|
||||||
|
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<Dialog Id="InstallFailed" Width="370" Height="270" Title="[ProductName] Setup">
|
||||||
|
<Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Setup failed" />
|
||||||
|
<Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70"
|
||||||
|
Text="[ProductName] setup could not be completed. Resolve the reported error and run setup again." />
|
||||||
|
<Control Id="Finish" Type="PushButton" X="280" Y="235" Width="70" Height="23" Default="yes" Cancel="yes" Text="&Finish">
|
||||||
|
<Publish Event="EndDialog" Value="Return" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<Dialog Id="InstallCancelled" Width="370" Height="270" Title="[ProductName] Setup">
|
||||||
|
<Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Setup cancelled" />
|
||||||
|
<Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70"
|
||||||
|
Text="[ProductName] setup was cancelled. Run setup again when you are ready." />
|
||||||
|
<Control Id="Finish" Type="PushButton" X="280" Y="235" Width="70" Height="23" Default="yes" Cancel="yes" Text="&Finish">
|
||||||
|
<Publish Event="EndDialog" Value="Return" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<!-- Shown by Windows Installer (Restart Manager) when an upgrade or repair must replace files
|
||||||
|
that a running app holds open. OK closes those programs (MSIRMSHUTDOWN=2) and
|
||||||
|
continues; Cancel ends setup. -->
|
||||||
|
<Dialog Id="MsiRMFilesInUse" Width="370" Height="200" Title="[ProductName] Setup" KeepModeless="yes">
|
||||||
|
<Control Id="Title" Type="Text" X="20" Y="15" Width="330" Height="25" Text="{\CraftInstallerTitle}Files in use" />
|
||||||
|
<Control Id="Description" Type="Text" X="20" Y="45" Width="330" Height="30"
|
||||||
|
Text="These programs are using files that setup needs to update. Click OK to close them and continue, or Cancel to stop setup." />
|
||||||
|
<Control Id="List" Type="ListBox" X="20" Y="80" Width="330" Height="55" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />
|
||||||
|
<Control Id="OK" Type="PushButton" X="195" Y="165" Width="75" Height="23" Default="yes" Text="OK">
|
||||||
|
<Publish Property="MSIRMSHUTDOWN" Value="2" Order="1" />
|
||||||
|
<Publish Event="EndDialog" Value="Return" Order="2" />
|
||||||
|
</Control>
|
||||||
|
<Control Id="Cancel" Type="PushButton" X="280" Y="165" Width="70" Height="23" Cancel="yes" Text="Cancel">
|
||||||
|
<Publish Event="EndDialog" Value="Exit" />
|
||||||
|
</Control>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<InstallUISequence>
|
||||||
|
<Show Dialog="InstallWelcome" Before="CostInitialize" Condition="UILevel = 5 AND NOT Installed AND NOT REMOVE AND NOT REINSTALL" />
|
||||||
|
<!-- Reinstall/Remove control events require the selection manager initialized by costing. -->
|
||||||
|
<Show Dialog="InstallMaintenance" After="CostFinalize" Condition="UILevel = 5 AND Installed AND NOT REMOVE AND NOT REINSTALL" />
|
||||||
|
|
||||||
|
<Show Dialog="InstallProgress" Before="ExecuteAction" Condition="UILevel = 5" />
|
||||||
|
<Show Dialog="InstallComplete" OnExit="success" Condition="UILevel = 5" />
|
||||||
|
<Show Dialog="InstallFailed" OnExit="error" Condition="UILevel = 5" />
|
||||||
|
<Show Dialog="InstallCancelled" OnExit="cancel" Condition="UILevel = 5" />
|
||||||
|
</InstallUISequence>
|
||||||
|
<AdminUISequence>
|
||||||
|
<Show Dialog="InstallProgress" Before="ExecuteAction" Condition="UILevel = 5" />
|
||||||
|
<Show Dialog="InstallComplete" OnExit="success" Condition="UILevel = 5" />
|
||||||
|
<Show Dialog="InstallFailed" OnExit="error" Condition="UILevel = 5" />
|
||||||
|
<Show Dialog="InstallCancelled" OnExit="cancel" Condition="UILevel = 5" />
|
||||||
|
</AdminUISequence>
|
||||||
|
</UI>
|
||||||
|
</Fragment>
|
||||||
|
<Fragment>
|
||||||
|
<!-- Keep MSI registration for repair, upgrades and managed removal, but let Settings
|
||||||
|
invoke our explicit UI command instead of Windows Installer's basic-UI ARP path. -->
|
||||||
|
<Property Id="ARPSYSTEMCOMPONENT" Value="1" />
|
||||||
|
<?if $(sys.BUILDARCH) = x86 ?>
|
||||||
|
<?define CraftMsiSystemFolder = SystemFolder ?>
|
||||||
|
<?else ?>
|
||||||
|
<?define CraftMsiSystemFolder = System64Folder ?>
|
||||||
|
<?endif ?>
|
||||||
|
<ComponentGroup Id="CraftInstallerSettings" Directory="INSTALLFOLDER">
|
||||||
|
<Component Id="CraftInstallerSettingsEntry" Guid="*">
|
||||||
|
<RegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Craft.cadcraft" ForceDeleteOnUninstall="yes">
|
||||||
|
<!-- Legacy Launchers match the canonical MSI name exactly; keep this alias distinct. -->
|
||||||
|
<RegistryValue Name="DisplayName" Type="string" Value="[ProductName] (Craft Apps)" KeyPath="yes" />
|
||||||
|
<RegistryValue Name="DisplayVersion" Type="string" Value="[ProductVersion]" />
|
||||||
|
<RegistryValue Name="Publisher" Type="string" Value="[Manufacturer]" />
|
||||||
|
<RegistryValue Name="DisplayIcon" Type="string" Value=""[INSTALLFOLDER]cadcraft.exe",0" />
|
||||||
|
<RegistryValue Name="InstallLocation" Type="string" Value="[INSTALLFOLDER]" />
|
||||||
|
<RegistryValue Name="URLInfoAbout" Type="string" Value="[ARPURLINFOABOUT]" />
|
||||||
|
<RegistryValue Name="URLUpdateInfo" Type="string" Value="[ARPURLUPDATEINFO]" />
|
||||||
|
<RegistryValue Name="HelpLink" Type="string" Value="[ARPHELPLINK]" />
|
||||||
|
<!-- Deliberately omit WindowsInstaller: Settings must honor UninstallString. -->
|
||||||
|
<RegistryValue Name="UninstallString" Type="string" Value=""[$(var.CraftMsiSystemFolder)]msiexec.exe" /x [ProductCode] /qf /norestart" />
|
||||||
|
<RegistryValue Name="QuietUninstallString" Type="string" Value=""[$(var.CraftMsiSystemFolder)]msiexec.exe" /x [ProductCode] /qn /norestart" />
|
||||||
|
<RegistryValue Name="ModifyPath" Type="string" Value=""[$(var.CraftMsiSystemFolder)]msiexec.exe" /i [ProductCode] /qf /norestart" />
|
||||||
|
</RegistryKey>
|
||||||
|
</Component>
|
||||||
|
<!-- Preserve the app-owned ARPNOMODIFY policy instead of inventing a new default. -->
|
||||||
|
<Component Id="CraftInstallerSettingsNoModify" Guid="*" Condition="ARPNOMODIFY = "1"">
|
||||||
|
<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Craft.cadcraft"
|
||||||
|
Name="NoModify" Type="integer" Value="1" KeyPath="yes" />
|
||||||
|
</Component>
|
||||||
|
</ComponentGroup>
|
||||||
|
</Fragment>
|
||||||
|
|
||||||
|
</Wix>
|
||||||
@@ -12,9 +12,8 @@
|
|||||||
warning when no signing secrets are set).
|
warning when no signing secrets are set).
|
||||||
|
|
||||||
Needs: Rust (MSVC toolchain + the target), the Windows SDK (rc.exe, signtool.exe),
|
Needs: Rust (MSVC toolchain + the target), the Windows SDK (rc.exe, signtool.exe),
|
||||||
and WiX v5 with its UI extension (the setup wizard):
|
and WiX v5:
|
||||||
dotnet tool install --global wix --version 5.0.2
|
dotnet tool install --global wix --version 5.0.2
|
||||||
wix extension add -g WixToolset.UI.wixext/5.0.2
|
|
||||||
|
|
||||||
.EXAMPLE
|
.EXAMPLE
|
||||||
pwsh packaging/windows/package.ps1 -Arch x64
|
pwsh packaging/windows/package.ps1 -Arch x64
|
||||||
@@ -95,7 +94,7 @@ Copy-Item (Join-Path $Bin 'cadcraft.exe'), (Join-Path $Bin 'cadcraft-cli.exe') $
|
|||||||
# ---- MSI ---------------------------------------------------------------------------------------
|
# ---- MSI ---------------------------------------------------------------------------------------
|
||||||
$Msi = Join-Path $Dist "cadcraft-$Version-windows-$Arch.msi"
|
$Msi = Join-Path $Dist "cadcraft-$Version-windows-$Arch.msi"
|
||||||
Invoke-Native 'wix build' {
|
Invoke-Native 'wix build' {
|
||||||
wix build (Join-Path $PSScriptRoot 'cadcraft.wxs') -arch $Arch -ext WixToolset.UI.wixext `
|
wix build (Join-Path $PSScriptRoot 'cadcraft.wxs') (Join-Path $PSScriptRoot 'installer-ui.wxs') -arch $Arch `
|
||||||
-d "Version=$MsiVersion" -d "BinDir=$Stage" -d "IconPath=$(Join-Path $Root 'assets\app-icon\cadcraft.ico')" `
|
-d "Version=$MsiVersion" -d "BinDir=$Stage" -d "IconPath=$(Join-Path $Root 'assets\app-icon\cadcraft.ico')" `
|
||||||
-o $Msi
|
-o $Msi
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user