Skip to content

Commit

Permalink
Fix windows nightly build (#6586)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
brettle committed Jul 29, 2024
1 parent 9902e0b commit a2b2beb
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 0 additions & 1 deletion scripts/packaging/files_msys64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion scripts/packaging/windows_distro.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.')

Expand Down
6 changes: 6 additions & 0 deletions src/webots/maths/WbMathsUtilities.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,13 @@ int WbMathsUtilities::convexHull(const QVector<WbVector2> &points, QVector<int>
iMin = i;
}

// 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<int> index(size);
#pragma GCC diagnostic pop
for (i = 0; i < size; ++i)
index[i] = i;

Expand Down

0 comments on commit a2b2beb

Please sign in to comment.