[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands
Continuous integration builds have changed state: Travis build 4180. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/448498521. Appveyor build 3978. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1800571_flag_add_ware-3978. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/+merge/358046 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1800571-flag-add-ware 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/bug-1800571-flag-add-ware into lp:widelands
I guess Launchpad doesn't like me since it doesn't want to show the diff here (again). And yes, I waited for the branch to be parsed after pushing it. :/ Anyway, here are the changes: https://bazaar.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/revision/8904/src/logic/map_objects/tribes/carrier.cc -- https://code.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/+merge/358046 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1800571-flag-add-ware 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/bug-1800571-flag-add-ware into lp:widelands
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands. Commit message: Undoing "optimization" that is part of previous commit in r8903. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1800571 in widelands: "crash with r8903" https://bugs.launchpad.net/widelands/+bug/1800571 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/+merge/358046 Commit r8903 moved some code within carrier.cc to avoid a duplicated call of a method in the Flag class. Unfortunately I overlooked that the call is no simple getter but modifies the internal state of the Flag, so it has to happen at the old code position. Now doing the call to the method potentially twice, but it doesn't really matters performance-wise anyway. For reference the old, buggy commit: https://bazaar.launchpad.net/~widelands-dev/widelands/bug-1797213-idle-wares-at-flags-carrier/revision/8903 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1800571-flag-add-ware 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/use_more_processors into lp:widelands
Continuous integration builds have changed state: Travis build 4179. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/448416745. Appveyor build 3977. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_use_more_processors-3977. -- https://code.launchpad.net/~widelands-dev/widelands/use_more_processors/+merge/358020 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/use_more_processors 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-website/tabbed_profile into lp:widelands-website
The alpha site is up and running. Since we removed PayPal, i have added a link to the screenshots in the header. -- https://code.launchpad.net/~widelands-dev/widelands-website/tabbed_profile/+merge/356749 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website. ___ 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/use_more_processors into lp:widelands
kaputtnik has proposed merging lp:~widelands-dev/widelands/use_more_processors into lp:widelands. Commit message: Use more processing units when using the compile script. Defaults to: max. processors -1 Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/use_more_processors/+merge/358020 Reason for this change: https://wl.widelands.org/forum/topic/4362/?page=1#post-26418 The command nproc is part of gnu-coreutils: https://www.gnu.org/software/coreutils/manual/html_node/nproc-invocation.html#nproc-invocation If only one processing unit is found, the command 'nproc --ignore=1' returns 1. At least on linux the switch '-j ' is known to all compilers (gnu, clang and ninja). I have tested gnu and clang. Maybe has to be tested on MacOs, if the compile script is used over there. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/use_more_processors into lp:widelands. === modified file 'compile.sh' --- compile.sh 2017-11-30 07:04:11 + +++ compile.sh 2018-10-30 14:45:28 + @@ -199,7 +199,8 @@ cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPTION_BUILD_WEBSITE_TOOLS=$BUILD_WEBSITE -DOPTION_BUILD_TRANSLATIONS=$BUILD_TRANSLATIONS -DOPTION_ASAN=$USE_ASAN fi -$buildtool +$buildtool -j "$(nproc --ignore=1)" + return 0 } ___ 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
