feat: update Windows installer to include WixUtilExtension and close running application
chore: bump version to 0.6.2 fix: improve update manager logic for caching and fetching releases
This commit is contained in:
parent
cbd1f3f77c
commit
88d9f200ab
9 changed files with 2947 additions and 2917 deletions
|
|
@ -299,6 +299,7 @@ class WindowsBuilder:
|
|||
candle_cmd = [
|
||||
str(candle_exe),
|
||||
"-ext", "WixUIExtension",
|
||||
"-ext", "WixUtilExtension",
|
||||
f"-dDistDir={self.dist_dir}",
|
||||
f"-dSourceDir={self.dist_dir}\\WebDropBridge", # Set SourceDir for Heat-generated files
|
||||
f"-dResourcesDir={self.project_root}\\resources", # Set ResourcesDir for branding assets
|
||||
|
|
@ -319,6 +320,7 @@ class WindowsBuilder:
|
|||
light_cmd = [
|
||||
str(light_exe),
|
||||
"-ext", "WixUIExtension",
|
||||
"-ext", "WixUtilExtension",
|
||||
"-b", str(self.dist_dir / "WebDropBridge"), # Base path for source files
|
||||
"-o", str(msi_output),
|
||||
str(wix_obj),
|
||||
|
|
@ -355,7 +357,8 @@ class WindowsBuilder:
|
|||
"""
|
||||
wix_content = f'''<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||
xmlns:ui="http://schemas.microsoft.com/wix/2010/ui">
|
||||
xmlns:ui="http://schemas.microsoft.com/wix/2010/ui"
|
||||
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<Product Id="*" Name="WebDrop Bridge" Language="1033" Version="{self.version}"
|
||||
Manufacturer="HIM-Tools"
|
||||
UpgradeCode="12345678-1234-1234-1234-123456789012">
|
||||
|
|
@ -378,6 +381,13 @@ class WindowsBuilder:
|
|||
<UIRef Id="WixUI_InstallDir" />
|
||||
<UIRef Id="WixUI_ErrorProgressText" />
|
||||
|
||||
<!-- Close running application before installation -->
|
||||
<util:CloseApplication
|
||||
Target="WebDropBridge.exe"
|
||||
CloseMessage="yes"
|
||||
RebootPrompt="no"
|
||||
ElevatedCloseMessage="no" />
|
||||
|
||||
<Feature Id="ProductFeature" Title="WebDrop Bridge" Level="1">
|
||||
<ComponentGroupRef Id="AppFiles" />
|
||||
<ComponentRef Id="ProgramMenuShortcut" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue