Change: Write dangerzone version and upgradecode into Package and SummaryInformation elements directly

This commit is contained in:
JKarasti 2024-09-23 22:17:03 +03:00 committed by Alex Pyrgiotis
parent 8bd9c05832
commit 3fff16cc7e
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA

View file

@ -118,17 +118,17 @@ def main():
"Package", "Package",
Name="Dangerzone", Name="Dangerzone",
Manufacturer="Freedom of the Press Foundation", Manufacturer="Freedom of the Press Foundation",
UpgradeCode="$(var.ProductUpgradeCode)", UpgradeCode="12b9695c-965b-4be0-bc33-21274e809576",
Language="1033", Language="1033",
Compressed="yes", Compressed="yes",
Codepage="1252", Codepage="1252",
Version="$(var.ProductVersion)", Version=version,
) )
ET.SubElement( ET.SubElement(
package_el, package_el,
"SummaryInformation", "SummaryInformation",
Keywords="Installer", Keywords="Installer",
Description="Dangerzone $(var.ProductVersion) Installer", Description="Dangerzone " + version + " Installer",
Codepage="1252", Codepage="1252",
) )
ET.SubElement(package_el, "MediaTemplate", EmbedCab="yes") ET.SubElement(package_el, "MediaTemplate", EmbedCab="yes")
@ -225,8 +225,6 @@ def main():
ET.SubElement(feature_el, "ComponentGroupRef", Id="ApplicationComponents") ET.SubElement(feature_el, "ComponentGroupRef", Id="ApplicationComponents")
ET.SubElement(feature_el, "ComponentRef", Id="ApplicationShortcuts") ET.SubElement(feature_el, "ComponentRef", Id="ApplicationShortcuts")
print(f'<?define ProductVersion = "{version}"?>')
print('<?define ProductUpgradeCode = "12b9695c-965b-4be0-bc33-21274e809576"?>')
ET.indent(wix_el, space=" ") ET.indent(wix_el, space=" ")
print(ET.tostring(wix_el).decode()) print(ET.tostring(wix_el).decode())