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

Proposed by Tino on 2018-11-13
Status: Merged
Merged at revision: 8922
Proposed branch: lp:~widelands-dev/widelands/update_appveyor
Merge into: lp:widelands
Diff against target: 61 lines (+10/-5)
3 files modified
CMakeLists.txt (+1/-1)
appveyor.yml (+2/-2)
utils/win32/innosetup/Widelands.iss (+7/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/update_appveyor
Reviewer Review Type Date Requested Status
Tino Approve on 2018-11-14
Review via email: mp+358712@code.launchpad.net

Commit message

changes appveyor platform update nov'18

To post a comment you must log in.
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4220. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/454562130.
Appveyor build 4016. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_update_appveyor-4016.

8921. By tino79 on 2018-11-14

use glew static, don't package libglbinding

GunChleoc (gunchleoc) wrote :

I'm wondering whether InnoSetup supports wildcards. If we could specify the .dlls as "libfluidsynth-?.dll" etc, there would be less maintenance needed for changes on AppVeyor.

Tino (tino79) wrote :

Yes, but this still would require to identify dlls in the first place. Just tested, and now we need some more dlls. (e.g. the famous libreadline7.dll ;) ).

Static linking would be the way to go.

But nearly all cmake package scripts default to the dynamic libs...

8922. By tino79 on 2018-11-14

static glew option seems to not work anymore
add missing dlls

8923. By tino79 on 2018-11-14

more missing dlls

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4225. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/454944754.
Appveyor build 4021. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_update_appveyor-4021.

Tino (tino79) wrote :

Ok, i'll merge this to trunk to get win builds up again.

I'll check the issue with glbinding the next days in a different branch...

@bunnybot merge

review: Approve
kaputtnik (franku) wrote :

Thanks a lot :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2018-10-19 16:42:42 +0000
3+++ CMakeLists.txt 2018-11-14 10:55:55 +0000
4@@ -71,7 +71,7 @@
5
6 if (WIN32)
7 set (Boost_USE_STATIC_LIBS ON)
8- link_libraries(wsock32 ws2_32)
9+ link_libraries(wsock32 ws2_32 bcrypt)
10 else()
11 set (Boost_USE_STATIC_LIBS OFF)
12 endif()
13
14=== modified file 'appveyor.yml'
15--- appveyor.yml 2018-09-19 12:04:36 +0000
16+++ appveyor.yml 2018-11-14 10:55:55 +0000
17@@ -21,7 +21,7 @@
18 - cmd: "bash --login -c \"pacman -Su --noconfirm\""
19 - cmd: "bash --login -c \"pacman -Su --noconfirm\""
20 # Installed required libs
21- - 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\""
22+ - 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\""
23
24 shallow_clone: true
25
26@@ -34,7 +34,7 @@
27 - cmd: md build
28 - cmd: cd build
29 - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
30- - cmd: "cmake -G \"Ninja\" -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%"
31+ - cmd: "cmake -G \"Ninja\" -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%"
32 - cmd: "cmake --build ."
33 on_success:
34 - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
35
36=== modified file 'utils/win32/innosetup/Widelands.iss'
37--- utils/win32/innosetup/Widelands.iss 2018-09-18 13:52:22 +0000
38+++ utils/win32/innosetup/Widelands.iss 2018-11-14 10:55:55 +0000
39@@ -101,7 +101,12 @@
40 Source: {#BuildFolder}\data\scripting\*; DestDir: {app}\data\scripting\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
41 Source: {#BuildFolder}\data\shaders\*; DestDir: {app}\data\shaders\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
42 Source: {#BuildFolder}\data\ai\*; DestDir: {app}\data\ai\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
43-Source: {#DLLFolder}\libglbinding.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
44+Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
45+Source: {#DLLFolder}\libopusfile-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
46+Source: {#DLLFolder}\libopus-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
47+Source: {#DLLFolder}\libtermcap-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
48+Source: {#DLLFolder}\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
49+Source: {#DLLFolder}\libreadline7.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
50 Source: {#DLLFolder}\libicuuc62.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
51 Source: {#DLLFolder}\libbz2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
52 Source: {#DLLFolder}\libfreetype-6.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
53@@ -129,7 +134,7 @@
54 Source: {#DLLFolder}\SDL2_ttf.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
55 Source: {#DLLFolder}\zlib1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
56 Source: {#DLLFolder}\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
57-Source: {#DLLFolder}\libfluidsynth-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
58+Source: {#DLLFolder}\libfluidsynth-2.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
59 Source: {#DLLFolder}\libportaudio-2.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
60 Source: {#DLLFolder}\libsndfile-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
61 Source: {#DLLFolder}\libspeex-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"