widelands

Merge lp:~widelands-dev/widelands/gcc9 into lp:widelands

  1. gcc9
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 9171
Proposed branch: lp:~widelands-dev/widelands/gcc9
Merge into: lp:widelands
Diff against target: 72 lines (+7/-25)
3 files modified
appveyor.yml (+2/-15)
src/graphic/gl/fields_to_draw.h (+4/-9)
utils/win32/innosetup/Widelands.iss (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/gcc9
Reviewer Review Type Date Requested Status
hessenfarmer playtest Approve
Review via email: mp+370692@code.launchpad.net

Commit message

Patch for GCC9.

Description of the change

Tested by kaputtnik

To post a comment you must log in.
Revision history for this message
kaputtnik (franku) wrote :

Didn't we need to adapt the travis/appveyor configuration?

I am unfamiliar with those configuration, so i didn't proposed the merge...

Revision history for this message
GunChleoc (gunchleoc) wrote :

Probably - I haven't looked into that yet.

Revision history for this message
Tino (tino79) wrote :

I've pushed the appveyor changes to a github branch: https://github.com/widelands/widelands/commit/1af305097f174a9a38e2710f3f96ed26d4f39e55

Sorry, I am not able to use bzr/launchpad on my new laptop anymore.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5286. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/564607195.
Appveyor build 5061. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc9-5061.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks, Tino!

I have applied your changes to this branch now.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Jobs are green on AppVeyor - can somebody with a Windows machine please test before we merge?

https://ci.appveyor.com/project/widelands-dev/widelands/builds/26365811

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

ok installed the appveyor x64 release build and did some playtest worked fine so far

review: Approve (playtest)
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for testing!

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'appveyor.yml'
--- appveyor.yml 2019-06-01 20:53:24 +0000
+++ appveyor.yml 2019-07-31 09:09:19 +0000
@@ -20,21 +20,8 @@
20 # Update msys2 system (twice, first run does system packages)20 # Update msys2 system (twice, first run does system packages)
21 - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""21 - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
22 - cmd: "bash --login -c \"pacman -Suuyy --nodeps --noconfirm\""22 - cmd: "bash --login -c \"pacman -Suuyy --nodeps --noconfirm\""
23 # we need to downgrade GCC to the last working version
24 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-8.3.0-2-any.pkg.tar.xz\""
25 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-libgfortran-8.3.0-2-any.pkg.tar.xz\""
26 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-fortran-8.3.0-2-any.pkg.tar.xz\""
27 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-objc-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-objc-8.3.0-2-any.pkg.tar.xz\""
28 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-8.3.0-2-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-x86_64-gcc-libs-8.3.0-2-any.pkg.tar.xz\""
29
30 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-7.4.0-1-any.pkg.tar.xz\""
31 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-libgfortran-7.4.0-1-any.pkg.tar.xz\""
32 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-fortran-7.4.0-1-any.pkg.tar.xz\""
33 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-objc-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-objc-7.4.0-1-any.pkg.tar.xz\""
34 - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-7.4.0-1-any.pkg.tar.xz && pacman --noconfirm --nodeps -U mingw-w64-i686-gcc-libs-7.4.0-1-any.pkg.tar.xz\""
35
36 # Installed required libs23 # Installed required libs
37 - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glew\""24 - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\""
3825
39shallow_clone: true26shallow_clone: true
4027
@@ -49,7 +36,7 @@
49 - cmd: md build36 - cmd: md build
50 - cmd: cd build37 - cmd: cd build
51 - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE38 - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
52 - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%)"39 - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%)"
53 - cmd: "cmake --build ."40 - cmd: "cmake --build ."
54on_success:41on_success:
55 - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe42 - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
5643
=== modified file 'src/graphic/gl/fields_to_draw.h'
--- src/graphic/gl/fields_to_draw.h 2019-05-29 15:43:40 +0000
+++ src/graphic/gl/fields_to_draw.h 2019-07-31 09:09:19 +0000
@@ -100,15 +100,10 @@
100 // coordinates in the map. Returns INVALID_INDEX if this field is not in the100 // coordinates in the map. Returns INVALID_INDEX if this field is not in the
101 // fields_to_draw.101 // fields_to_draw.
102 inline int calculate_index(int fx, int fy) const {102 inline int calculate_index(int fx, int fy) const {
103 uint16_t xidx = fx - min_fx_;103 if (fx < min_fx_ || fx > max_fx_ || fy < min_fy_ || fy > max_fy_) {
104 if (xidx >= w_) {104 return kInvalidIndex;
105 return kInvalidIndex;105 }
106 }106 return (fy - min_fy_) * w_ + (fx - min_fx_);
107 uint16_t yidx = fy - min_fy_;
108 if (yidx >= h_) {
109 return kInvalidIndex;
110 }
111 return yidx * w_ + xidx;
112 }107 }
113108
114private:109private:
115110
=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss 2019-07-19 13:16:07 +0000
+++ utils/win32/innosetup/Widelands.iss 2019-07-31 09:09:19 +0000
@@ -114,7 +114,7 @@
114#else114#else
115Source: {#DLLFolder}\libgcc_s_dw2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"115Source: {#DLLFolder}\libgcc_s_dw2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
116#endif116#endif
117Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"117Source: {#DLLFolder}\libglbinding.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
118Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"118Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
119Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"119Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
120Source: {#DLLFolder}\libicudt64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"120Source: {#DLLFolder}\libicudt64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"

Subscribers

People subscribed via source and target branches

to status/vote changes: