Thread: [Winmerge-development] Transition to APR
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: Kimmo V. <ki...@wi...> - 2006-10-19 20:56:09
|
Time to start thinking about this too... I've downloaded and build APR for Windows, but I haven't yet looked into adding it into WinMerge. We can build APR as static (lib) or dynamic (dll) library. I think dynamic linking would be easier at first, so everybody do not need to build APR, but can just download the DLL file. One important thing is how we do this transition: 1) in small pieces in svn trunk or 2) create a branch for it, convert most important parts to play with APR and then merge changes to svn trunk Downside in 1 is that it can cause some conflicts if there are others working with code being converted. Otherwise I'm pro for working in trunk. We don't need to add APR code to our repository, we can just use Subversion's externals keywords to checkout the sources to working copy. See for example how TortoiseSVN does this. APR seems to offer XML parser, so we propably should replace our own parser with APR. Project files code would be the first to convert. Regards, Kimmo |
From: Christian L. <lis...@ho...> - 2006-10-20 17:20:05
|
> I've downloaded and build APR for Windows, but I haven't yet looked into > adding it into WinMerge. We can build APR as static (lib) or dynamic > (dll) library. I think dynamic linking would be easier at first, so > everybody do not need to build APR, but can just download the DLL file. Agreed, I think dynamic linking is the way to go. It also creates a very clear separation of APR code from our library. > One important thing is how we do this transition: > 1) in small pieces in svn trunk > or > 2) create a branch for it, convert most important parts to play with APR > and then merge changes to svn trunk Let's use trunk. We have a stable branch for 2.6 already, so if we break trunk for a little while during this transition, I think it's okay. > APR seems to offer XML parser, so we propably should replace our own > parser with APR. Project files code would be the first to convert. The less code we have to maintain the better. So let's get rid of our XML parser. Regards Christian |
From: Kimmo V. <ki...@wi...> - 2006-10-22 17:03:11
|
>> One important thing is how we do this transition: >> 1) in small pieces in svn trunk >> or >> 2) create a branch for it, convert most important parts to play with APR >> and then merge changes to svn trunk > > Let's use trunk. > We have a stable branch for 2.6 already, so if we break trunk for a little > while during this transition, I think it's okay. Yep, 2.6 branch is still almost identical to trunk, I've mostly added some small warning fixes to trunk. So if somebody needs stable code to build on, branch is anyways better for that. One question is where we checkout and build APR? I'd suggest we add new top-level folder for external code and checkout APR folders under it. And build lib-file (for DLL) into /Build folder's subfolders. So like this: .. |- External | |- apr | |- apr-iconv | |- apr-util ... |- Src I'm going to checkout latest stable branches for APR, not trunk. Regards, Kimmo |