Skip to content

Commit a2b2beb

Browse files
authored
Fix windows nightly build (cyberbotics#6586)
* Remove qwindowsvistastyle.dll which isn't installed. * Don't fail silently when trying to build windows distro. * Ignore false warning produced by recent GCC version. * Only suppress warning for versions of GCC where it exists. * Revert to single quotes.
1 parent 9902e0b commit a2b2beb

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

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

src/webots/maths/WbMathsUtilities.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,13 @@ int WbMathsUtilities::convexHull(const QVector<WbVector2> &points, QVector<int>
107107
iMin = i;
108108
}
109109

110+
// Ignore false positive warning produced by some versions of GCC.
111+
#pragma GCC diagnostic push
112+
#if __GNUC__ >= 7
113+
#pragma GCC diagnostic ignored "-Wstringop-overflow"
114+
#endif
110115
QVector<int> index(size);
116+
#pragma GCC diagnostic pop
111117
for (i = 0; i < size; ++i)
112118
index[i] = i;
113119

0 commit comments

Comments
 (0)