On 11/26, STF wrote: > On 24 November 2014 at 22:50, Timothy Johnson <[email protected]> > wrote: > > > On 11/24/2014 10:36 AM, Steve Borho wrote: > > > On 11/24, Yuya Nishihara wrote: > > >> On Sat, 22 Nov 2014 14:13:18 -0500, Timothy Johnson wrote: > > >>>> Somebody needs to build KDiff3 of 32/64bit versions against the > > bundled > > >>>> QtGui4.dll, which I think uses MSVC C++ ABI. > > >>> Do you mean someone would need to volunteer to build KDiff3? I assumed > > >>> the build process was automated. > > >> Maybe. AFAIK, automated build is tough issue on Windows. > > > The last time I build kdiff3 on Windows, it required a number of > > > hand-patching to get it to compile. Since then, I've just kept those > > > pre-built binaries. > > > > > > In general, I don't have time to futz with kdiff3 each release. > > > > > > I just did a quick clone of their git repo and it is refusing to compile > > > out of the box without KDE4 sources; which is a non-starter. > > > > > > > I just found the most recent version of the KDiff3 readme on their git > > repo at http://sourceforge.net/p/kdiff3/code/ci/master/tree/kdiff3/README. > > It clearly says that one can build "KDiff3 with Qt4-libs, but *without > > KDE*", so it should be possible following the instructions given there. > > > > > How KDiff3 is customized in THg and how does it differ from the one we get > from the normal setup of KDiff3 that we can download at > http://kdiff3.sourceforge.net/ ?
it's not customized at all > Can we just include the official KDiff3 setup inside THg setup? We have not done this in the past out of simolicity and the belief that most THG users do not wish the THG installer to add a shell extension for kdiff3 and other details. Those that do want that are free to install kdiff3 themselves. The only reasons we package kdiff3 are: 1) it is GPL 2) it supports 3-way diffs, so it is much better than svn's TortoiseMerge 3) it links with the Qt libraries we already package, so it is very small 4) Windows doesn't have any default fallbacks like vimdiff I've lost track of where this conversation started? Is there an actual problem with the kdiff3 binary we package? The root problem for me is that making releases already takes multiple hours, and it sometimes takes me more than a week to find that kind of time. Anything which needlessly adds more steps is a non-starter. -- Steve Borho ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
