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

Proposed by Tino
Status: Merged
Merged at revision: 8939
Proposed branch: lp:~widelands-dev/widelands/appveyor_reenable_glbinding
Merge into: lp:widelands
Diff against target: 47 lines (+6/-5)
2 files modified
appveyor.yml (+4/-4)
utils/win32/innosetup/Widelands.iss (+2/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/appveyor_reenable_glbinding
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+360052@code.launchpad.net

Commit message

Use glbinding on Appveyor again, pre-built package was updated: https://github.com/Alexpux/MINGW-packages/issues/4671

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

Continuous integration builds have changed state:

Travis build 4321. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/463332067.
Appveyor build 4117. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_reenable_glbinding-4117.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

@bunnybot merge

review: Approve

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 2018-11-14 09:19:46 +0000
3+++ appveyor.yml 2018-12-04 12:51:24 +0000
4@@ -18,10 +18,10 @@
5 # Update mirrors
6 - cmd: "bash --login -c \"pacman --noconfirm --sync pacman pacman-mirrors\""
7 # Update msys2 system (twice, first run does system packages)
8- - cmd: "bash --login -c \"pacman -Su --noconfirm\""
9- - cmd: "bash --login -c \"pacman -Su --noconfirm\""
10+ - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
11+ - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
12 # Installed required libs
13- - 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\""
14+ - 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\""
15
16 shallow_clone: true
17
18@@ -34,7 +34,7 @@
19 - cmd: md build
20 - cmd: cd build
21 - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
22- - 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%"
23+ - 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%"
24 - cmd: "cmake --build ."
25 on_success:
26 - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
27
28=== modified file 'utils/win32/innosetup/Widelands.iss'
29--- utils/win32/innosetup/Widelands.iss 2018-11-14 10:55:20 +0000
30+++ utils/win32/innosetup/Widelands.iss 2018-12-04 12:51:24 +0000
31@@ -101,7 +101,7 @@
32 Source: {#BuildFolder}\data\scripting\*; DestDir: {app}\data\scripting\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
33 Source: {#BuildFolder}\data\shaders\*; DestDir: {app}\data\shaders\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
34 Source: {#BuildFolder}\data\ai\*; DestDir: {app}\data\ai\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
35-Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
36+Source: {#DLLFolder}\libglbinding.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
37 Source: {#DLLFolder}\libopusfile-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
38 Source: {#DLLFolder}\libopus-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
39 Source: {#DLLFolder}\libtermcap-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
40@@ -145,6 +145,7 @@
41 Source: {#DLLFolder}\libiconv-2.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
42 Source: {#DLLFolder}\libgraphite2.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
43 Source: {#DLLFolder}\libpcre-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
44+Source: {#DLLFolder}\libzstd.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
45 Source: {#BuildFolder}\build\src\widelands.exe; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
46 Source: {#BuildFolder}\ChangeLog; DestDir: {app}; Flags: ignoreversion; DestName: ChangeLog.txt; Components: "Widelands"
47 Source: {#BuildFolder}\COPYING; DestDir: {app}; Flags: ignoreversion; DestName: COPYING.txt; Components: "Widelands"

Subscribers

People subscribed via source and target branches

to status/vote changes: