Developer forums (C::B DEVELOPMENT STRICTLY!) > Development
Splitting debugger in two - specific debugger and common GUI
Jenna:
After removing the png's at the end with a text-editor (on linux), I was able to apply the patch against clean svn r5755 on windows with TortoiseSVN.
oBFusCATed:
What do you use to apply the patch?
When I used "tortoisesvn->apply patch", it told me that there are binary files but it skipped them and the rest was applied correctly (I think)
Here is the full source: http://smrt.is-a-geek.org/codeblocks/dbg_refactor/cb_dbg_refactor.zip
I prefer to send it all so it will be easier for you to do a full tree diff (I've used winmerge on windows to do it).
The source is base on r5755.
You can try this patch: http://smrt.is-a-geek.org/codeblocks/dbg_refactor/dbg_refactor0003_win_svn_no_png.patch
I've removed the pngs, don't know why they are there :(
I've tried to apply the patch with the patch command line tool on linux, but it doesn't recognised the moved files as such and keeps telling me that the patch is reversed :(
Sorry for the annoyance and the problems with the applying. :(
p.s. I've created the patch (svn_win) with "tortoisesvn -> create patch", might that cause the problems? I can recreate it with "svn diff"
p.s.s. jens have done the same as my no_png file :)
p.s.s.s. Just to remind that you need wxPropGrid from svn in order to compile it
MortenMacFly:
--- Quote from: oBFusCATed on September 09, 2009, 09:18:29 pm ---p.s. I've created the patch (svn_win) with "tortoisesvn -> create patch", might that cause the problems? I can recreate it with "svn diff"
--- End quote ---
SVN diff is always the way to prefer as this will work reliable. Actually TortoiseSVN should do the same... but it seems not.
--- Quote from: oBFusCATed on September 09, 2009, 09:18:29 pm ---p.s.s.s. Just to remind that you need wxPropGrid from svn in order to compile it
--- End quote ---
Ooops - just realised exactly that need.
P.s.: Instead of P.s.s.s I guess it should have read P.p.p.s ;-)
MortenMacFly:
Ok... merging is (sowmehow) done. I am starting to compile now. Something I have noticed:
You also have moved resource files (XRC's) to the SDK resources but left them in the debugger, too. Doesn't this result in a conflict? Should I better remove the duplicate resources from the debugger folder (in plugins), too?
Oh - and how did you compile the propgrid from SVN? Do you use wx29 already after all? (propgrid is not part of the wx 2.8.10 sources AFAIK...)
oBFusCATed:
--- Quote from: MortenMacFly on September 10, 2009, 08:09:56 am ---SVN diff is always the way to prefer as this will work reliable. Actually TortoiseSVN should do the same... but it seems not.
--- Quote from: oBFusCATed on September 09, 2009, 09:18:29 pm ---p.s.s.s. Just to remind that you need wxPropGrid from svn in order to compile it
--- End quote ---
Ooops - just realised exactly that need.
--- End quote ---
--- Quote from: MortenMacFly on September 10, 2009, 09:37:37 am ---Ok... merging is (sowmehow) done. I am starting to compile now. Something I have noticed:
You also have moved resource files (XRC's) to the SDK resources but left them in the debugger, too. Doesn't this result in a conflict? Should I better remove the duplicate resources from the debugger folder (in plugins), too?
--- End quote ---
I've move the files, so the one that are in both sdk and the debugger, should be removed from the debugger.
--- Quote from: MortenMacFly on September 10, 2009, 09:37:37 am ---Oh - and how did you compile the propgrid from SVN? Do you use wx29 already after all? (propgrid is not part of the wx 2.8.10 sources AFAIK...)
--- End quote ---
I'm using wx2.8.10 + self-compiled wxpropgrid by a self-made C::B project :)
Here it is http://smrt.is-a-geek.org/codeblocks/dbg_refactor/wxpropgrid-svn.zip
--- Quote from: MortenMacFly on September 10, 2009, 08:09:56 am ---P.s.: Instead of P.s.s.s I guess it should have read P.p.p.s ;-)
--- End quote ---
Thanks :)
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version