widelands

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

  1. appveyor_fixes_may_19
  2. Merge into trunk
Proposed by hessenfarmer
Status: Merged
Merged at revision: 9139
Proposed branch: lp:~widelands-dev/widelands/appveyor_fixes_may_19
Merge into: lp:widelands
Diff against target: 73 lines (+19/-10)
2 files modified
appveyor.yml (+17/-7)
utils/win32/innosetup/Widelands.iss (+2/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/appveyor_fixes_may_19
Reviewer Review Type Date Requested Status
GunChleoc Approve
Widelands Developers Pending
Review via email: mp+368210@code.launchpad.net

Commit message

appveyor fixes

Description of the change

downgrading gcc to 8.3 for x64 and 7.4 for x86
using only glew

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

Continuous integration builds have changed state:

Travis build 5110. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/539922141.
Appveyor build 4892. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fixes_may_19-4892.

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

it does compile but it does not run. ir crashes when the replay writer starts with a [sync] reset

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

it should work now. only tested x64 release though. other builds need top be tested

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5125. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/540210338.
Appveyor build 4907. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fixes_may_19-4907.

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

travis error is the inputqueues again

Revision history for this message
GunChleoc (gunchleoc) wrote :

Tested x86 debug build, that should give us an OK cross-section.

@bunnybot merge force

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

thanks for the review tested all other builds. so we are safe with this.

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

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'appveyor.yml'
2--- appveyor.yml 2019-04-25 15:49:31 +0000
3+++ appveyor.yml 2019-06-01 20:59:35 +0000
4@@ -19,12 +19,22 @@
5 - cmd: "bash --login -c \"pacman --noconfirm --sync pacman pacman-mirrors\""
6 # Update msys2 system (twice, first run does system packages)
7 - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
8- - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
9+ - cmd: "bash --login -c \"pacman -Suuyy --nodeps --noconfirm\""
10+ # we need to downgrade GCC to the last working version
11+ - 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\""
12+ - 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\""
13+ - 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\""
14+ - 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\""
15+ - 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\""
16+
17+ - 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\""
18+ - 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\""
19+ - 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\""
20+ - 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\""
21+ - 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\""
22+
23 # Installed required libs
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\""
25- - cmd: "IF \"%PLATFORM%\" == \"x86\" (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glew\") ELSE (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glbinding\")"
26- # CMake can't find Boost 1.70 yet, so we have to downgrade
27- # - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz\""
28+ - 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\""
29
30 shallow_clone: true
31
32@@ -33,13 +43,13 @@
33 - _widelands_dev_widelands_trunk
34
35 build_script:
36- # copy modified libintl.h to solve an issue with boost 1.69
37+ # copy modified libintl.h to solve an issue with boost
38 - cmd: patch %MINGWINCLUDE%\libintl.h %APPVEYOR_BUILD_FOLDER%\utils\appveyor\libintl.patch
39 - cmd: cd %APPVEYOR_BUILD_FOLDER%
40 - cmd: md build
41 - cmd: cd build
42 - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
43- - 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=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%)"
44+ - 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%)"
45 - cmd: "cmake --build ."
46 on_success:
47 - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
48
49=== modified file 'utils/win32/innosetup/Widelands.iss'
50--- utils/win32/innosetup/Widelands.iss 2019-04-23 07:47:25 +0000
51+++ utils/win32/innosetup/Widelands.iss 2019-06-01 20:59:35 +0000
52@@ -103,7 +103,7 @@
53 Source: {#BuildFolder}\data\ai\*; DestDir: {app}\data\ai\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
54 Source: {#DLLFolder}\libopusfile-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
55 Source: {#DLLFolder}\libopus-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
56-Source: {#DLLFolder}\libtermcap-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
57+Source: {#DLLFolder}\libpdcurses.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
58 Source: {#DLLFolder}\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
59 Source: {#DLLFolder}\libreadline8.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
60 Source: {#DLLFolder}\libicuuc64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
61@@ -111,11 +111,10 @@
62 Source: {#DLLFolder}\libfreetype-6.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
63 #if GetEnv("PLATFORM") == "x64"
64 Source: {#DLLFolder}\libgcc_s_seh-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
65-Source: {#DLLFolder}\libglbinding.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
66 #else
67 Source: {#DLLFolder}\libgcc_s_dw2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
68+#endif
69 Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
70-#endif
71 Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
72 Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
73 Source: {#DLLFolder}\libicudt64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"

Subscribers

People subscribed via source and target branches

to status/vote changes: