[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/test_merge into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/test_merge into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/test_merge into lp:widelands. Commit message: This is a test branch to check a refactoring of bunnybot. Please ignore. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636 This is a test branch to check a refactoring of bunnybot. Please ignore. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/test_merge into lp:widelands. === modified file 'src/base/macros.h' --- src/base/macros.h 2017-07-01 20:32:02 + +++ src/base/macros.h 2017-08-06 21:16:27 + @@ -17,6 +17,8 @@ * */ +this is a syntax error. + #ifndef WL_BASE_MACROS_H #define WL_BASE_MACROS_H ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/test_merge into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_cmakelist into lp:widelands
Also there are new logic/ai_dna_handler.* files, maybe they should be mentioned somewhere as well.. -- https://code.launchpad.net/~widelands-dev/widelands/ai_cmakelist/+merge/328630 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_cmakelist. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_cmakelist into lp:widelands
Thanks Tino :-) Maybe there should be added a comment to the CMakeLists.txt to not forget adjusting the Widelands.iss file if some folders get added/removed? -- https://code.launchpad.net/~widelands-dev/widelands/ai_cmakelist/+merge/328630 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_cmakelist. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_cmakelist into lp:widelands
Yes, new files/directories have to be added to the Innosetup file. Give me a few minutes... -- https://code.launchpad.net/~widelands-dev/widelands/ai_cmakelist/+merge/328630 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_cmakelist. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_cmakelist into lp:widelands
>From my understanding the file utils/win32/innosetup/Widelands.iss has to be >adjusted for windows. See: http://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/utils/win32/innosetup/Widelands.iss Afaik innosetup is the installer program for windows. It's a bit ambiguous that the folder is called win32 but from what i can see appveyor uses this file also when creating x64 builds. See the line 2300 in e.g.: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_cmakelist-2330/job/q4s7wglxiqno2hwh#L2300 Maybe we should ping Tino? -- https://code.launchpad.net/~widelands-dev/widelands/ai_cmakelist/+merge/328630 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_cmakelist. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_cmakelist into lp:widelands
Well, on linux it works, I am but afraid that windows build is not governed by CmakeList, but by some other file - that needs to be updated. On my linux everything works fine, including loading maps. -- https://code.launchpad.net/~widelands-dev/widelands/ai_cmakelist/+merge/328630 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_cmakelist. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
