[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-19 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/appveyor-fix into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 -- Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-19 Thread GunChleoc
Review: Approve 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 h

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-18 Thread kaputtnik
> The latest artifacts are available anyhow. Didn't know this. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor-fix. ___ Maili

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-18 Thread hessenfarmer
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 -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-18 Thread kaputtnik
Just a try to get bunnybot work on this. No idea if this helps... -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor-fix. ___ Mai

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-18 Thread hessenfarmer
@kaputtnik: What is the reason for resubmitting this merge request? It hasn't been disapproved or marked needs fixing yet. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-18 Thread kaputtnik
Review: Resubmit -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor-fix. ___ Mailing list: https://launchpad.net/~widelands-dev

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-17 Thread GunChleoc
No, testing with OSX is not required - this branch only affects the Windows builds downloadable from AppVeyor -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-17 Thread 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? -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the propose

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-17 Thread hessenfarmer
for the moment I am fine with this branch so if anyone could test the artifacts we could merge this. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor-f

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-17 Thread GunChleoc
We use Glew in the non-Windows builds as well, so if it works that will be good enough for me. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor-fix in

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread hessenfarmer
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. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelan

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread kaputtnik
Great work, hessenfarmer. A big step towards releasing build 20 :-) -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor-fix into lp:widelands. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread GunChleoc
And the builds are green again :) Let's wait for the current artifacts and test them a bit before merging. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/app

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread bunnybot
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_f

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread hessenfarmer
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.) -- https:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread Tino
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) -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers i

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread hessenfarmer
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\"

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread hessenfarmer
just checked appveyor and x86 is still failing due to that I forgot to make the cmake command dependent from architecture as well. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~wid

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-15 Thread hessenfarmer
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. s

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-14 Thread kaputtnik
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. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the propo

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-14 Thread bunnybot
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_f

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-14 Thread Toni Förster
Creating the patch: diff -u libintl.h your_libintl.h > libintl.patch applying the patch: patch libintl.h libintl.patch -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-d

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-14 Thread hessenfarmer
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. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-14 Thread GunChleoc
If you can get this working, it would be cleaner to create a patch file and apply the patch. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor-fix into

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-13 Thread bunnybot
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_fi

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-fix into lp:widelands

2019-02-13 Thread hessenfarmer
hessenfarmer has proposed merging lp:~widelands-dev/widelands/appveyor-fix into lp:widelands. Commit message: Attempt to fix appveyor problems with boost 1.69 and x86 builds by providing a modified libintl.h file Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #180