Merge branch 'fix-windows-distro' into fix-Hinge2Joint-and-windows-di…

…stro
DeepBlueRobotics · Jul 28, 2024 · 335386c · 335386c
2 parents bd575b4 + b7781f5
commit 335386c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scripts/packaging/files_msys64.txt b/scripts/packaging/files_msys64.txt
@@ -33,7 +33,6 @@
 /mingw64/share/qt6/plugins/imageformats/qjpeg.dll
 /mingw64/bin/libjpeg-8.dll
 /mingw64/share/qt6/plugins/platforms/qwindows.dll
-/mingw64/share/qt6/plugins/styles/qwindowsvistastyle.dll
 /mingw64/share/qt6/plugins/tls/qcertonlybackend.dll
 /mingw64/share/qt6/plugins/tls/qopensslbackend.dll
 /mingw64/share/qt6/plugins/tls/qschannelbackend.dll

diff --git a/scripts/packaging/windows_distro.py b/scripts/packaging/windows_distro.py
@@ -205,7 +205,9 @@ def create_webots_bundle(self, include_commit_file):
         else:
             INNO_SETUP_HOME = "/C/Program Files (x86)/Inno Setup 6"
         print('creating webots_setup.exe (takes long)\n')
-        subprocess.run([INNO_SETUP_HOME + '/iscc', '-Q', 'webots.iss'])
+        subprocess.run(
+            [INNO_SETUP_HOME + "/iscc", "-Q", "webots.iss"]
+        ).check_returncode()
 
         print('Done.')