almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch 'windows'

Browse source
This commit is contained in:
Micah Lee 2021-06-22 12:10:04 -07:00
commit b92ae1c592
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
install/windows/build-wxs.py
View file

@ -154,7 +154,7 @@ def main():
"Product", "Product",
Name="Dangerzone", Name="Dangerzone",
Manufacturer="First Look Media", Manufacturer="First Look Media",
Id="f40ff0a9-ebf8-4e1e-9bce-6ab5c74fe119", Id="*",
UpgradeCode="$(var.ProductUpgradeCode)", UpgradeCode="$(var.ProductUpgradeCode)",
Language="1033", Language="1033",
Codepage="1252", Codepage="1252",
@ -203,41 +203,16 @@ def main():
Id="WixUIDialogBmp", Id="WixUIDialogBmp",
Value="..\\..\\install\\windows\\dialog.bmp", Value="..\\..\\install\\windows\\dialog.bmp",
) )
upgrade_el = ET.SubElement(product_el, "Upgrade", Id="$(var.ProductUpgradeCode)")
ET.SubElement( ET.SubElement(
upgrade_el,
"UpgradeVersion",
Minimum="$(var.ProductVersion)",
OnlyDetect="yes",
Property="NEWERVERSIONDETECTED",
)
ET.SubElement(
upgrade_el,
"UpgradeVersion",
Minimum="0.0.0",
Maximum="$(var.ProductVersion)",
IncludeMinimum="yes",
IncludeMaximum="no",
Property="OLDERVERSIONBEINGUPGRADED",
)
condition_el = ET.SubElement(
product_el, product_el,
"Condition", "MajorUpgrade",
Message="A newer version of this software is already installed.", AllowSameVersionUpgrades="yes",
DowngradeErrorMessage="A newer version of [ProductName] is already installed. If you are sure you want to downgrade, remove the existing installation via Programs and Features.",
) )
condition_el.text = "NOT NEWERVERSIONDETECTED"
build_dir_xml(product_el, data) build_dir_xml(product_el, data)
component_ids = build_components_xml(product_el, data) component_ids = build_components_xml(product_el, data)
install_exec_seq_el = ET.SubElement(
product_el,
"InstallExecuteSequence",
)
ET.SubElement(
install_exec_seq_el, "RemoveExistingProducts", After="InstallValidate"
)
feature_el = ET.SubElement(product_el, "Feature", Id="DefaultFeature", Level="1") feature_el = ET.SubElement(product_el, "Feature", Id="DefaultFeature", Level="1")
for component_id in component_ids: for component_id in component_ids:
ET.SubElement(feature_el, "ComponentRef", Id=component_id) ET.SubElement(feature_el, "ComponentRef", Id=component_id)