From f50f08d779067956a9080c7c6ca948fb44389d40 Mon Sep 17 00:00:00 2001 From: Dean Brettle Date: Fri, 26 Jul 2024 14:16:17 -0700 Subject: [PATCH 1/5] Remove qwindowsvistastyle.dll which isn't installed. --- scripts/packaging/files_msys64.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/packaging/files_msys64.txt b/scripts/packaging/files_msys64.txt index da0973f9162..9926518a30b 100644 --- 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 From b7781f5842cb3445cfd86bd2c947c1acc8a92f74 Mon Sep 17 00:00:00 2001 From: Dean Brettle Date: Fri, 26 Jul 2024 15:33:26 -0700 Subject: [PATCH 2/5] Don't fail silently when trying to build windows distro. --- scripts/packaging/windows_distro.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/packaging/windows_distro.py b/scripts/packaging/windows_distro.py index 9b07f5be493..f0000e50622 100644 --- 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.') From bae372a55c26d39c4c3539ba145645ec875fd499 Mon Sep 17 00:00:00 2001 From: Dean Brettle Date: Sun, 28 Jul 2024 12:26:13 -0700 Subject: [PATCH 3/5] Ignore false warning produced by recent GCC version. --- src/webots/maths/WbMathsUtilities.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/webots/maths/WbMathsUtilities.cpp b/src/webots/maths/WbMathsUtilities.cpp index edfcf16d43a..62fdca500c2 100644 --- a/src/webots/maths/WbMathsUtilities.cpp +++ b/src/webots/maths/WbMathsUtilities.cpp @@ -107,7 +107,11 @@ int WbMathsUtilities::convexHull(const QVector &points, QVector iMin = i; } + // Ignore false positive warning produced by some versions of GCC. +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstringop-overflow" QVector index(size); +#pragma GCC diagnostic pop for (i = 0; i < size; ++i) index[i] = i; From 3a42f3be64d5779834e5900c24aaef8b9104ec2c Mon Sep 17 00:00:00 2001 From: Dean Brettle Date: Sun, 28 Jul 2024 12:50:41 -0700 Subject: [PATCH 4/5] Only suppress warning for versions of GCC where it exists. --- src/webots/maths/WbMathsUtilities.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/webots/maths/WbMathsUtilities.cpp b/src/webots/maths/WbMathsUtilities.cpp index 62fdca500c2..fcbff381dfa 100644 --- a/src/webots/maths/WbMathsUtilities.cpp +++ b/src/webots/maths/WbMathsUtilities.cpp @@ -109,7 +109,9 @@ int WbMathsUtilities::convexHull(const QVector &points, QVector // Ignore false positive warning produced by some versions of GCC. #pragma GCC diagnostic push +#if __GNUC__ >= 7 #pragma GCC diagnostic ignored "-Wstringop-overflow" +#endif QVector index(size); #pragma GCC diagnostic pop for (i = 0; i < size; ++i) From 252699f5a9284362ed80fba5d6a9a465fae2f236 Mon Sep 17 00:00:00 2001 From: Dean Brettle Date: Mon, 29 Jul 2024 06:30:25 -0700 Subject: [PATCH 5/5] Revert to single quotes. --- scripts/packaging/windows_distro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packaging/windows_distro.py b/scripts/packaging/windows_distro.py index f0000e50622..8179153c9c7 100644 --- a/scripts/packaging/windows_distro.py +++ b/scripts/packaging/windows_distro.py @@ -206,7 +206,7 @@ def create_webots_bundle(self, include_commit_file): 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"] + [INNO_SETUP_HOME + '/iscc', '-Q', 'webots.iss'] ).check_returncode() print('Done.')