Le 07/06/2012 17:59, Nick Treleaven a écrit : > On 06/06/2012 15:42, Nick Treleaven wrote: >>> OK, I tried building it and found some fixes are necessary for the >>> Windows makefiles - I'll commit these to a branch. After those changes, >>> it seems to build fine. >> >> Now pushed to: >> https://github.com/ntrel/geany/commits/tm/tree-refactoring >> >> > Thanks for doing this, the structure is much better than before. >> > However, the build changes are quite substantial, so I think it >> might be >> > best not to include them in the 1.22 release in case it introduces any >> > problems. >> > >> > Also, I found the problem with suppressed gcc warnings in tagmanager >> > code - it was the hardcoded -w switch (which I read as -W)!
Oh great, tricky to find out! >> > Unfortunately this commit will conflict with the tree refactoring. I >> > will try to resolve the conflicts so we can merge the branch, perhaps >> > after the 1.22 release? >> >> I also have a ctags/c.c fix I'd like to include in the release, so >> please let me know whether to delay it until merging this branch, >> although as I said, it might be better to leave this out of the release. >> I'm still happy to try to fix the conflicts myself, even if we do delay >> the merge. > > I've now merged in master to my branch, same URL - surprisingly git > didn't report any conflicts, I think because it recognizes moved files, > even when there is some changed content, e.g. tagmanager/makefile.win32 > -> tagmanager/ctags/makefile.win32. So all I had to do was make my CFLAG > changes to the new file tagmanager/src/makefile.win32. > > I don't mind if you want to merge my branch before the release, I just > wanted to raise the issue. Or shall I merge it now? No you're right, it's quite large and maybe have hidden problems (although I doubt so but only testing will show off), after the release is better. And it's not something users mind about, so they won't notice either way anyway. So just push your fix to current master and we will merge the branch after the release. As you said, Git seems to be clever enough to deal with the renames anyway so it shouldn't cause too much trouble merging later anyway. And thanks for the tests and fixes :) Regards, Colomban _______________________________________________ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
