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

2014-10-04 Thread Hans Joachim Desserud
>should work. our filesystem abstraction works with "/" all the way through Ok, sounds good. :) I wasn't sure whether it would do that, or we needed to deal with it in a platform-independent way when creating and passing it around. Just wanted to check in case it came back to bite us with odd pr

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

2014-10-04 Thread SirVer
should work. our filesystem abstraction works with "/" all the way through, but no, i have not tested on windows. usually, tino tests if he finds time, otherwise, the nightlies inform us very quickly. -- https://code.launchpad.net/~widelands-dev/widelands/fix_setup_searchpaths/+merge/236410 Your

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

2014-10-04 Thread Hans Joachim Desserud
Hi. Saw that this was merged now, removing the method and reducing amount of IFDEFs. :) I wonder whether this was tested on Microsoft Windows. Especially the line std::string(INSTALL_PREFIX) + "/" + std::string(INSTALL_DATADIR); which looks platform dependent, and should maybe have some way to k

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

2014-10-04 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/fix_setup_searchpaths into lp:widelands has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_setup_searchpaths/+merge/236410 -- https://code.launchpad.net/~widelands-dev/

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

2014-10-04 Thread SirVer
Review: Resubmit Diff comments: > === modified file 'src/wlapplication.cc' > --- src/wlapplication.cc 2014-09-20 09:37:47 + > +++ src/wlapplication.cc 2014-09-29 19:43:04 + > @@ -109,97 +109,6 @@ > > } // namespace > > - > -/** > - * Sets the filelocators default searchp

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

2014-10-04 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fix_setup_searchpaths into lp:widelands has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_setup_searchpaths/+merge/236410 -- https://code.launchpad.net/~wideland

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

2014-10-03 Thread GunChleoc
ETA: I just ran into the bug with a fresh branch. Merging this into the branch fixed it (Ubuntu 14.04). -- https://code.launchpad.net/~widelands-dev/widelands/fix_setup_searchpaths/+merge/236410 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelan

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

2014-10-03 Thread GunChleoc
This doesn't compile, you need to change a line (see diff comment). Otherwise, I did a bit of testing. The paths already work for me without this fix, bue it doesn't make things worse either. Diff comments: > === modified file 'src/wlapplication.cc' > --- src/wlapplication.cc 2014-09-20 09

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

2014-09-29 Thread GunChleoc
Thanks! I did do a bzr pull, but you pushed something while I was busy solving conflicts, compiling and testing - will use shelve in the future :) -- https://code.launchpad.net/~widelands-dev/widelands/fix_setup_searchpaths/+merge/236410 Your team Widelands Developers is requested to review the

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

2014-09-29 Thread SirVer
> I was just wondering if I had messed anything up. We were both working on > trunk at the same time. yes, that is why you always have to pull before pushing, so that you do not accidentally overpush somebody elses changes. Unfortunately, bzr makes this all to easy to mess up. If you pull, you

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

2014-09-29 Thread GunChleoc
I was just wondering if I had messed anything up. We were both working on trunk at the same time. I have a question though - just trying to understand this cmake stuff a bit: Why is it "WL_INSTALL_DATADIR" in CMakeLists.txt , but "INSTALL_DATADIR" without the "WL_" in src/wlapplication.cc? --

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

2014-09-29 Thread SirVer
Since someone changed the history of trunk, I had to fix this branch up and repush. The branch history therefore looks funny in the launchpad web app, but it is in fact just the last commit I added. -- https://code.launchpad.net/~widelands-dev/widelands/fix_setup_searchpaths/+merge/236410 Your t

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

2014-09-29 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/fix_setup_searchpaths into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1342228 in widelands: "Widelands searches system paths for its data files by default." https://bugs.launchpad.net/wide