Merge lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

[hessenfarmer]

Attempt to fix appveyor problems with boost 1.69 and x86 builds by providing a modified libintl.h file

added a copy of modified libintl.h in an appveyor folder in utils
modified appveyor.yml to copy this file to the relevant include folder.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4470. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/492937714.
Appveyor build 4258. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fix-4258.

[GunChleoc (gunchleoc)]

If you can get this working, it would be cleaner to create a patch file and apply the patch.

[hessenfarmer (stephan-lutz)]

it works for x64.
Currently x86 is still failing, but I suspect GLbinding being the issue as it was some time ago for x64.
I will try to confirm this tonight.
However I do not know how to create a patch file.

[Toni Förster (stonerl)]

Creating the patch:

diff -u libintl.h your_libintl.h > libintl.patch

applying the patch:

patch libintl.h libintl.patch

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4474. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/493525261.
Appveyor build 4262. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fix-4262.

[kaputtnik (franku)]

Maybe you can use a yaml syntax checker? E.g. http://ben-kiki.org/ypaste/ (link from yaml.org), or https://yamlchecker.com

Didn't tested those though.

[hessenfarmer (stephan-lutz)]

Good idea.
Now I know what is wrong

line 25 must read
- 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\")"

there were some superfluous quotation marks.

so if anybody want to change this and upload it during the day he is very welcome.
Otherwise I'll do it tonight

[hessenfarmer (stephan-lutz)]

just checked appveyor and x86 is still failing due to that I forgot to make the cmake command dependent from architecture as well.

[hessenfarmer (stephan-lutz)]

Line 40 needs to be

"IF \"%PLATFORM%\" == \"x86\" (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%) ELSE (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%)"

[Tino (tino79)]

If you are using GLEW instead of GLBindings you'll have to set OPTION_GLEW_STATIC=1 and/or adapt the innosetup script to include the glew dll (and you can omit the libglbinding.dll)

[hessenfarmer (stephan-lutz)]

I have updated the innosetup script as well to include the glew ddll or the glbinding dll in regard of the system.
Mainly I wanted to proof that the x86 issue is within glbinding. If the branch works in principle I could optimize it with different options (Glew static, Patchfile etc.)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4477. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/493702657.
Appveyor build 4265. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fix-4265.

[GunChleoc (gunchleoc)]

And the builds are green again :)

Let's wait for the current artifacts and test them a bit before merging.

[kaputtnik (franku)]

Great work, hessenfarmer. A big step towards releasing build 20 :-)

[hessenfarmer (stephan-lutz)]

thanks the current job on appveyor looks promising. we still need to find out what is causing the issue with glbinding. Probably just rebuilding them could help like it has been last time for x64.

[GunChleoc (gunchleoc)]

We use Glew in the non-Windows builds as well, so if it works that will be good enough for me.

[hessenfarmer (stephan-lutz)]

for the moment I am fine with this branch
so if anyone could test the artifacts we could merge this.

[Klaus Halfmann (klaus-halfmann)]

Us tesing with OSX a) requireed
n) if yes where can I downlaod the artifacts from
https://travis-ci.org/widelands/widelands/builds/493702657 or such?

[GunChleoc (gunchleoc)]

No, testing with OSX is not required - this branch only affects the Windows builds downloadable from AppVeyor

[kaputtnik (franku)]

review: Needs Resubmitting

[hessenfarmer (stephan-lutz)]

@kaputtnik: What is the reason for resubmitting this merge request?

It hasn't been disapproved or marked needs fixing yet.

[kaputtnik (franku)]

Just a try to get bunnybot work on this. No idea if this helps...

[hessenfarmer (stephan-lutz)]

I think bunnybot will fetch the results as soon as a merge request is issued.

The latest artifacts are available anyhow.

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

[kaputtnik (franku)]

> The latest artifacts are available anyhow.

Didn't know this.

[GunChleoc (gunchleoc)]

Bunnybot will only posts on status changes, because it was too spammy if it posted on every build.

In order to trigger new builds, you'll need to push a change to the branch, e.g. by merging master.

Resubmit will trigger a new mail to the mailing list with a diff attached.

I have now done some testing as well and it's working for me. Thanks a lot for the fix!

@bunnybot merge

review: Approve

=== modified file 'appveyor.yml'
--- appveyor.yml	2018-12-21 21:00:14 +0000
+++ appveyor.yml	2019-02-15 20:05:00 +0000
@@ -7,7 +7,7 @@
 environment:
   appveyor_build_worker_cloud: gce
 init:
-  - cmd: "IF \"%PLATFORM%\" == \"x86\" (set MINGWPATH=C:\\msys64\\mingw32\\bin& set MINGWSUFFIX=i686) ELSE (set MINGWPATH=C:\\msys64\\mingw64\\bin& set MINGWSUFFIX=x86_64)"
+  - cmd: "IF \"%PLATFORM%\" == \"x86\" (set MINGWPATH=C:\\msys64\\mingw32\\bin& set MINGWSUFFIX=i686& set MINGWINCLUDE=C:\\msys64\\mingw32\\include) ELSE (set MINGWPATH=C:\\msys64\\mingw64\\bin& set MINGWSUFFIX=x86_64& set MINGWINCLUDE=C:\\msys64\\mingw64\\include)"
 
 install:
   # Installing various utilities
@@ -21,10 +21,9 @@
   - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
   - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
   # Installed required libs
-  - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-wget mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\""
-  # Download and install Boost 1.68 --since 1.69 breaks compiling
-  # https://bugs.launchpad.net/widelands/+bug/1808481
-  - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.68.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.68.0-2-any.pkg.tar.xz\""
+  - 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\""
+  - 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\")"
+
 shallow_clone: true
 
 branches:
@@ -32,11 +31,13 @@
     - _widelands_dev_widelands_trunk
 
 build_script:
+  # copy modified libintl.h to solve an issue with boost 1.69
+  - cmd: patch %MINGWINCLUDE%\libintl.h %APPVEYOR_BUILD_FOLDER%\utils\appveyor\libintl.patch
   - cmd: cd %APPVEYOR_BUILD_FOLDER%
   - cmd: md build
   - cmd: cd build
   - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
-  - 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%"
+  - cmd: "IF \"%PLATFORM%\" == \"x86\" (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%) ELSE (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%)"
   - cmd: "cmake --build ."
 on_success:
   - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
@@ -49,8 +50,7 @@
 
 platform:
   - x64
-# Temporarly, disable x86 builds since they are failing.
-#  - x86
+  - x86
 
 configuration:
   - Release

=== added directory 'utils/appveyor'
=== added file 'utils/appveyor/libintl.patch'
--- utils/appveyor/libintl.patch	1970-01-01 00:00:00 +0000
+++ utils/appveyor/libintl.patch	2019-02-15 20:05:00 +0000
@@ -0,0 +1,11 @@
+--- libintl_old.h	2019-02-15 19:55:07.174212400 +0100
++++ libintl.h	2019-01-28 20:24:23.387172100 +0100
+@@ -366,7 +366,7 @@
+ extern int vsprintf (char *, const char *, va_list);
+ #endif
+ 
+-#if 1
++#if 0
+ 
+ #if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
+ #undef snprintf

=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss	2018-12-04 12:40:11 +0000
+++ utils/win32/innosetup/Widelands.iss	2019-02-15 20:05:00 +0000
@@ -101,7 +101,6 @@
 Source: {#BuildFolder}\data\scripting\*;                               DestDir: {app}\data\scripting\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
 Source: {#BuildFolder}\data\shaders\*;                                 DestDir: {app}\data\shaders\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
 Source: {#BuildFolder}\data\ai\*;                                 DestDir: {app}\data\ai\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
-Source: {#DLLFolder}\libglbinding.dll;                        DestDir: {app};            Flags: ignoreversion;                                                        Components: "Widelands"
 Source: {#DLLFolder}\libopusfile-0.dll;                 DestDir: {app};            Flags: ignoreversion;                                                        Components: "Widelands"
 Source: {#DLLFolder}\libopus-0.dll;                     DestDir: {app};            Flags: ignoreversion;                                                        Components: "Widelands"
 Source: {#DLLFolder}\libtermcap-0.dll;                 DestDir: {app};            Flags: ignoreversion;                                                        Components: "Widelands"
@@ -112,8 +111,10 @@
 Source: {#DLLFolder}\libfreetype-6.dll;                 DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 #if GetEnv("PLATFORM") == "x64"
 Source: {#DLLFolder}\libgcc_s_seh-1.dll;                DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
+Source: {#DLLFolder}\libglbinding.dll;                  DestDir: {app};            Flags: ignoreversion;                                                        Components: "Widelands"
 #else
 Source: {#DLLFolder}\libgcc_s_dw2-1.dll;                DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
+Source: {#DLLFolder}\glew32.dll;                        DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 #endif
 Source: {#DLLFolder}\libglib-2.0-0.dll;                 DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 Source: {#DLLFolder}\libharfbuzz-0.dll;                 DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"