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

Fix Python version in Windows build scripts

Browse source 
Windows python build scripts were still referencing the old python 3.9
version, whereas 3.10 is the currently used one in the dev environment.
This commit is contained in:
deeplow 2022-12-01 11:49:22 +00:00
parent 642d86899b
commit 5761255b56
No known key found for this signature in database
GPG key ID: 577982871529A52A
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
install/windows/build-app.bat
View file

@ -6,8 +6,8 @@ REM build the exe
python .\setup-windows.py build
REM code sign dangerzone.exe
signtool.exe sign /v /d "Dangerzone" /sha1 1a0345732140749bdaa03efe8591b2c2a036884c /tr http://timestamp.digicert.com build\exe.win-amd64-3.9\dangerzone.exe
signtool.exe sign /v /d "Dangerzone" /sha1 1a0345732140749bdaa03efe8591b2c2a036884c /tr http://timestamp.digicert.com build\exe.win-amd64-3.9\dangerzone-cli.exe
signtool.exe sign /v /d "Dangerzone" /sha1 1a0345732140749bdaa03efe8591b2c2a036884c /tr http://timestamp.digicert.com build\exe.win-amd64-3.10\dangerzone.exe
signtool.exe sign /v /d "Dangerzone" /sha1 1a0345732140749bdaa03efe8591b2c2a036884c /tr http://timestamp.digicert.com build\exe.win-amd64-3.10\dangerzone-cli.exe
REM build the wix file
python install\windows\build-wxs.py > build\Dangerzone.wxs

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

@ -23,7 +23,7 @@ def build_data(dirname, dir_prefix, id_, name):
id_prefix = id_
# Skip lib/Pyside2/Examples folder
if "\\build\\exe.win-amd64-3.9\\lib\\PySide2\\examples" in dirname:
if "\\build\\exe.win-amd64-3.10\\lib\\PySide2\\examples" in dirname:
continue
id_value = f"{id_prefix}{basename.capitalize().replace('-', '_')}"
@ -121,7 +121,7 @@ def main():
dist_dir = os.path.join(
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))),
"build",
"exe.win-amd64-3.9",
"exe.win-amd64-3.10",
)
if not os.path.exists(dist_dir):
print("You must build the dangerzone binary before running this")
@ -145,7 +145,7 @@ def main():
data["dirs"][0]["dirs"].append(
build_data(
dist_dir,
"exe.win-amd64-3.9",
"exe.win-amd64-3.10",
"INSTALLDIR",
"Dangerzone",
)