Skip to content

Commit 335386c

Browse files
committed
Merge branch 'fix-windows-distro' into fix-Hinge2Joint-and-windows-distro
2 parents bd575b4 + b7781f5 commit 335386c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

scripts/packaging/files_msys64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
/mingw64/share/qt6/plugins/imageformats/qjpeg.dll
3434
/mingw64/bin/libjpeg-8.dll
3535
/mingw64/share/qt6/plugins/platforms/qwindows.dll
36-
/mingw64/share/qt6/plugins/styles/qwindowsvistastyle.dll
3736
/mingw64/share/qt6/plugins/tls/qcertonlybackend.dll
3837
/mingw64/share/qt6/plugins/tls/qopensslbackend.dll
3938
/mingw64/share/qt6/plugins/tls/qschannelbackend.dll

scripts/packaging/windows_distro.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,9 @@ def create_webots_bundle(self, include_commit_file):
205205
else:
206206
INNO_SETUP_HOME = "/C/Program Files (x86)/Inno Setup 6"
207207
print('creating webots_setup.exe (takes long)\n')
208-
subprocess.run([INNO_SETUP_HOME + '/iscc', '-Q', 'webots.iss'])
208+
subprocess.run(
209+
[INNO_SETUP_HOME + "/iscc", "-Q", "webots.iss"]
210+
).check_returncode()
209211

210212
print('Done.')
211213

0 commit comments

Comments
 (0)