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

Change: Write Dangerzone.wxs inside the script directly

Browse source 
Also reduce duplication slightly by definig `build_dir`, `cx_freeze_dir` and `dist_dir`
This commit is contained in:
JKarasti 2024-09-23 22:35:34 +03:00 committed by Alex Pyrgiotis
parent 3db1ca1fbb
commit 2053c98c09
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,11 +86,15 @@ def main():
# -rc markers. # -rc markers.
version = f.read().strip().split("-")[0] version = f.read().strip().split("-")[0]
dist_dir = os.path.join( build_dir = os.path.join(
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))),
"build", "build",
"exe.win-amd64-3.12",
) )
cx_freeze_dir = "exe.win-amd64-3.12"
dist_dir = os.path.join(build_dir, cx_freeze_dir)
if not os.path.exists(dist_dir): if not os.path.exists(dist_dir):
print("You must build the dangerzone binary before running this") print("You must build the dangerzone binary before running this")
return return
@ -98,7 +102,7 @@ def main():
# Prepare data for WiX file harvesting from the output of cx_Freeze # Prepare data for WiX file harvesting from the output of cx_Freeze
data = build_data( data = build_data(
dist_dir, dist_dir,
"exe.win-amd64-3.12", cx_freeze_dir,
"INSTALLFOLDER", "INSTALLFOLDER",
"Dangerzone", "Dangerzone",
) )
@ -226,7 +230,9 @@ def main():
ET.SubElement(feature_el, "ComponentRef", Id="ApplicationShortcuts") ET.SubElement(feature_el, "ComponentRef", Id="ApplicationShortcuts")
ET.indent(wix_el, space=" ") ET.indent(wix_el, space=" ")
print(ET.tostring(wix_el).decode())
with open(os.path.join(build_dir, "Dangerzone.wxs"), "w") as wxs_file:
wxs_file.write(ET.tostring(wix_el).decode())
if __name__ == "__main__": if __name__ == "__main__":