unifying libdiff2

[Jeremy Whiting]

Kevin,

Thanks for reviewing, I've created libkomparediff2 with all of libdiff2 and
libdialogpages/settingsbase.* and diffsettings.* and kompare builds against
it (on master branch only, 4.11 and previous still has libdiff2 inside
kompare.)  I've merged my branch into kompare on git master branch.

Next I will get kdevelop using libkomparediff2 from kdesdk, including
checking if there are any changes in the kdevplatform copy that we want in
the main git repo.

thanks,
Jeremy


On Sat, Jul 20, 2013 at 4:25 PM, Kevin Kofler <kevin.kofler at chello.at>wrote:

> Hi Jeremy,
>
> On Friday 19 July 2013 at 17:59:33, Jeremy Whiting wrote:
> > Thanks for the guidance.  I did decide the actions and such do belong
> > inside KompareModelList afterall, and found a way to make KomparePart get
> > the actions from the KompareModelList and add them to it's own
> > actionCollection.  I've pushed a branch to kompare called movelibdiff2 if
> > you want to take a look.  It works ok here, but I'll let you guys see
> what
> > you think of my solution.
> >
> > My libdiff2 is at scratch/whiting/libdiff2 and builds by itself and
> > installs a LibKompareDiff2Config.cmake file that libdialogpages on my
> > branch uses to find LibKompareDiff2 variables to build against.
>
> I looked at your changes, everything looks fine to me, so:
>
> Ship it!
>
>         Kevin Kofler
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20130729/e348aeb6/attachment.html>