Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
Return="check"
Impersonate="no" />
<CustomAction Id="CA_LibVirtualHidUninstallDriver"
Directory="INSTALL_ROOT"
ExeCommand="&quot;[WindowsFolder]System32\WindowsPowerShell\v1.0\powershell.exe&quot; -WindowStyle Hidden -NoProfile -ExecutionPolicy Bypass -File &quot;[INSTALL_ROOT]scripts\windows\uninstall-driver.ps1&quot; -Force -RemoveCertificateSubject &quot;CN=libvirtualhid CI Test Driver Signing&quot; -LogPath &quot;[CommonAppDataFolder]libvirtualhid\uninstall-driver.log&quot;"
Directory="WindowsFolder"
ExeCommand="&quot;[WindowsFolder]System32\WindowsPowerShell\v1.0\powershell.exe&quot; -WindowStyle Hidden -NoProfile -ExecutionPolicy Bypass -File &quot;[#CM_FP_scripts.windows.uninstall_driver.ps1]&quot; -Force -RemoveCertificateSubject &quot;CN=libvirtualhid CI Test Driver Signing&quot; -LogPath &quot;[CommonAppDataFolder]libvirtualhid\uninstall-driver.log&quot;"
Execute="deferred"
Return="check"
Impersonate="no" />
<CustomAction Id="CA_LibVirtualHidUninstallDriverSilent"
Directory="INSTALL_ROOT"
ExeCommand="&quot;[WindowsFolder]System32\WindowsPowerShell\v1.0\powershell.exe&quot; -WindowStyle Hidden -NoProfile -ExecutionPolicy Bypass -File &quot;[INSTALL_ROOT]scripts\windows\uninstall-driver.ps1&quot; -Force -RemoveCertificateSubject &quot;CN=libvirtualhid CI Test Driver Signing&quot; -LogPath &quot;[CommonAppDataFolder]libvirtualhid\uninstall-driver.log&quot;"
Directory="WindowsFolder"
ExeCommand="&quot;[WindowsFolder]System32\WindowsPowerShell\v1.0\powershell.exe&quot; -WindowStyle Hidden -NoProfile -ExecutionPolicy Bypass -File &quot;[#CM_FP_scripts.windows.uninstall_driver.ps1]&quot; -Force -RemoveCertificateSubject &quot;CN=libvirtualhid CI Test Driver Signing&quot; -LogPath &quot;[CommonAppDataFolder]libvirtualhid\uninstall-driver.log&quot;"
Execute="deferred"
Return="check"
Impersonate="no" />
Expand Down
1 change: 1 addition & 0 deletions cmake/packaging/wix_resources/wix.template.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

<WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/>
<StandardDirectory Id="WindowsFolder"/>

<?ifdef CPACK_WIX_PRODUCT_ICON?>
<Property Id="ARPPRODUCTICON" Value="ProductIcon.ico" />
Expand Down
4 changes: 2 additions & 2 deletions docs/windows-driver.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ powershell -ExecutionPolicy Bypass -File .\scripts\windows\uninstall-driver.ps1
-LogPath .\cmake-build-windows-driver\uninstall-driver.log
```

The WiX installer also places validation files under the default install root,
`C:\Program Files\libvirtualhid`:
The WiX installer places validation files under the selected install root, which
defaults to `C:\Program Files\libvirtualhid`:

- `tools\windows\gamepad_adapter.exe`
- `tools\windows\virtualhid_control.exe`
Expand Down
Loading