[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-release-team
Subject: Re: unifying libdiff2
From: Jeremy Whiting <jpwhiting () kde ! org>
Date: 2013-07-25 3:06:04
Message-ID: CADWV2K5rrGKXo6+yiLP4=y5qSC4YpdLavbus=amnqD+sKSBJaw () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Ok, added to module.git in master branch of release-tools.
As for Messages.sh should it use kompare.pot still? or a new .pot file?
BR,
Jeremy
On Wed, Jul 24, 2013 at 4:58 PM, Albert Astals Cid <aacid@kde.org> wrote:
> El Dimecres, 24 de juliol de 2013, a les 16:24:40, Jeremy Whiting va
> escriure:
> > It will be released with the SC for 4.12.
>
> Can you please add it to modules.git in release-tools repo?
>
> Also please fix i18n, you have i18n() calls and no Messages.sh
>
> > I'll be removing it from both
> > kompare.git and kdevplatform.git (it's under plugins/patchreview/
> > currently) but I guess I can't nuke it from kdevplatform until after KDE
> SC
> > 4.12 is released, eh?
>
> Makes sense.
>
> Cheers,
> Albert
>
> >
> > BR,
> > Jeremy
> >
> > On Wed, Jul 24, 2013 at 4:16 PM, Albert Astals Cid <aacid@kde.org>
> wrote:
> > > El Dimecres, 24 de juliol de 2013, a les 16:12:15, Jeremy Whiting va
> > >
> > > escriure:
> > > > Hello Release team, a quick question. I've split kompare/libdiff2
> into
> > > > it's own git repository libkomparediff2 which builds on its own has
> all
> > > > branches/tags, etc. but need it to not be split for KDE SC 4.11 since
> > > > that's frozen anyway, so I guess I need to only merge my changes to
> > >
> > > kompare
> > >
> > > > to the master branch, and KDE/4.11 branch can be used to release KDE
> SC
> > > > 4.11.x releases, right?
> > >
> > > Yes, that is correct.
> > >
> > > Is libkomparediff2 going to be part of the SC for 4.12 or released
> > > independently?
> > >
> > > Cheers,
> > >
> > > Albert
> > >
> > > > Kevin,
> > > > I've pushed my libkomparediff2 to the new official git repo, if you
> > > > could
> > > > check it and kompare on my branch builds ok for you I'd appreciate
> it.
> > >
> > > then
> > >
> > > > I'll enable the hooks and do the other items on my list (make
> > >
> > > kdevplatform
> > >
> > > > use it, check the differences between the two copies, etc.
> > > >
> > > > thanks,
> > > > Jeremy
> > > >
> > > > On Sat, Jul 20, 2013 at 4:25 PM, Kevin Kofler <
> kevin.kofler@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
>
>
[Attachment #5 (text/html)]
<div dir="ltr">Ok, added to module.git in master branch of \
release-tools.<div><br></div><div>As for Messages.sh should it use kompare.pot still? \
or a new .pot file?</div><div><br></div><div>BR,</div><div>Jeremy</div></div> <div \
class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Jul 24, 2013 at 4:58 PM, \
Albert Astals Cid <span dir="ltr"><<a href="mailto:aacid@kde.org" \
target="_blank">aacid@kde.org</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> El Dimecres, 24 de juliol de 2013, a les 16:24:40, Jeremy \
Whiting va escriure:<br> <div class="im">> It will be released with the SC for \
4.12.<br> <br>
</div>Can you please add it to modules.git in release-tools repo?<br>
<br>
Also please fix i18n, you have i18n() calls and no Messages.sh<br>
<div class="im"><br>
> I'll be removing it from both<br>
> kompare.git and kdevplatform.git (it's under plugins/patchreview/<br>
> currently) but I guess I can't nuke it from kdevplatform until after KDE \
SC<br> > 4.12 is released, eh?<br>
<br>
</div>Makes sense.<br>
<br>
Cheers,<br>
Albert<br>
<div class="HOEnZb"><div class="h5"><br>
><br>
> BR,<br>
> Jeremy<br>
><br>
> On Wed, Jul 24, 2013 at 4:16 PM, Albert Astals Cid <<a \
href="mailto:aacid@kde.org">aacid@kde.org</a>> wrote:<br> > > El Dimecres, \
24 de juliol de 2013, a les 16:12:15, Jeremy Whiting va<br> > ><br>
> > escriure:<br>
> > > Hello Release team, a quick question. I've split kompare/libdiff2 \
into<br> > > > it's own git repository libkomparediff2 which builds on \
its own has all<br> > > > branches/tags, etc. but need it to not be split \
for KDE SC 4.11 since<br> > > > that's frozen anyway, so I guess I need \
to only merge my changes to<br> > ><br>
> > kompare<br>
> ><br>
> > > to the master branch, and KDE/4.11 branch can be used to release KDE \
SC<br> > > > 4.11.x releases, right?<br>
> ><br>
> > Yes, that is correct.<br>
> ><br>
> > Is libkomparediff2 going to be part of the SC for 4.12 or released<br>
> > independently?<br>
> ><br>
> > Cheers,<br>
> ><br>
> > Albert<br>
> ><br>
> > > Kevin,<br>
> > > I've pushed my libkomparediff2 to the new official git repo, if \
you<br> > > > could<br>
> > > check it and kompare on my branch builds ok for you I'd appreciate \
it.<br> > ><br>
> > then<br>
> ><br>
> > > I'll enable the hooks and do the other items on my list (make<br>
> ><br>
> > kdevplatform<br>
> ><br>
> > > use it, check the differences between the two copies, etc.<br>
> > ><br>
> > > thanks,<br>
> > > Jeremy<br>
> > ><br>
> > > On Sat, Jul 20, 2013 at 4:25 PM, Kevin Kofler <<a \
href="mailto:kevin.kofler@chello.at">kevin.kofler@chello.at</a><br> > > \
><br> > > >wrote:<br>
> > > > Hi Jeremy,<br>
> > > ><br>
> > > > On Friday 19 July 2013 at 17:59:33, Jeremy Whiting wrote:<br>
> > > > > Thanks for the guidance. I did decide the actions and such \
do<br> > > > > > belong<br>
> > > > > inside KompareModelList afterall, and found a way to \
make<br> > > > > > KomparePart<br>
> > > > > get<br>
> > > > > the actions from the KompareModelList and add them to \
it's own<br> > > > > > actionCollection. I've pushed a branch \
to kompare called<br> > ><br>
> > movelibdiff2<br>
> ><br>
> > > > > if<br>
> > > > > you want to take a look. It works ok here, but I'll let \
you guys<br> > > > > > see<br>
> > > ><br>
> > > > what<br>
> > > ><br>
> > > > > you think of my solution.<br>
> > > > ><br>
> > > > > My libdiff2 is at scratch/whiting/libdiff2 and builds by \
itself and<br> > > > > > installs a LibKompareDiff2Config.cmake file \
that libdialogpages on<br> > > > > > my<br>
> > > > > branch uses to find LibKompareDiff2 variables to build \
against.<br> > > > ><br>
> > > > I looked at your changes, everything looks fine to me, so:<br>
> > > ><br>
> > > > Ship it!<br>
> > > ><br>
> > > > Kevin Kofler<br>
<br>
</div></div></blockquote></div><br></div>
_______________________________________________
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic