Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation
Hi Marat, On Wed, 8 Oct 2014, Marat Radchenko wrote: On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote: I wanted to verify that on msysgit but some patches fail to apply cleanly. Did you also had to tweak the patches? If yes, are these tweaked patches still available somewhere? msysgit != git-for-windows, as msysgit folks say. That's not what msysgit folks say (they say that msysgit is the development environment to build Git for Windows [*1*]), and Thomas is well aware of the situation because he is a busy contributor on the Windows side. I tested my patches by applying them to git.git/master and building inside msysgit. So the idea would be to rebase from git/git/master onto msysgit/git/master. Did you do that yet? Ciao, Johannes Footnote *1*: msysgit is about to be phased out. As soon as https://github.com/git-for-windows/sdk is able to produce a Git for Windows installer (it already able to build Git and pass the test suite), we will switch to the new development environment and mark msysgit as obsolete, keeping it around only for reference. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation
On Wed, Oct 08, 2014 at 10:59:57AM +0200, Johannes Schindelin wrote: Hi Marat, On Wed, 8 Oct 2014, Marat Radchenko wrote: That's not what msysgit folks say (they say that msysgit is the development environment to build Git for Windows [*1*]). Aaargh! msys != msysgit != Git for Windows SDK != Git for Windows != mingwGitDevEnv and possibly != git-for-windows. Oh, there's also mingw-w64-git from msys2 [1]. I tested my patches by applying them to git.git/master and building inside msysgit. So the idea would be to rebase from git/git/master onto msysgit/git/master. Did you do that yet? No, what for? Windows flavors of Git are already fragmented too much, my patchset is deliberately targeted at Git upstream. [1] https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-git -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation
Hi Thomas, On Wed, 8 Oct 2014, Thomas Braun wrote: I wanted to verify that on msysgit but some patches fail to apply cleanly. Did you also had to tweak the patches? I applied the patches to git-for-windows/git's master, manually fixing three of them, and pushed the result to the 'w64' branch in my fork. Please find them here: https://github.com/dscho/git/compare/git-for-windows:master...w64 and rebased onto msysgit's master: https://github.com/dscho/git/compare/msysgit:master...w64-msysgit Ciao, Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [msysGit] [PATCH v4] MinGW(-W64) compilation
Hi all, On Tue, 30 Sep 2014, Marat Radchenko wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). To make it easier to review and substantially easier to work on this patch series with Git, I opened a pull request on GitHub: https://github.com/msysgit/git/pull/264 Ciao, Johannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4] MinGW(-W64) compilation
Am 08.10.2014 um 06:53 schrieb Marat Radchenko: On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote: Am 30.09.2014 um 09:02 schrieb Marat Radchenko: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). *Compilation* tested on: - MSVC - msysGit environment (twice) Hi Marat, I wanted to verify that on msysgit but some patches fail to apply cleanly. Did you also had to tweak the patches? If yes, are these tweaked patches still available somewhere? msysgit != git-for-windows, as msysgit folks say. msysgit is a development environment for git-for-windows. I surely know that! I tested my patches by applying them to git.git/master and building inside msysgit. Fine, but then please explicitly state that. Compiling git.git/master in msysgit and msysgit.git/master in msysgit are two different things. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation
Hi Marat, On Wed, 8 Oct 2014, Marat Radchenko wrote: On Wed, Oct 08, 2014 at 10:59:57AM +0200, Johannes Schindelin wrote: So the idea would be to rebase from git/git/master onto msysgit/git/master. Did you do that yet? No, what for? To work together? If you are not interested in working together to make Git on 64-bit Windows kick-ass, just say so. Ciao, Johannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [msysGit] [PATCH v4] MinGW(-W64) compilation
On Wed, Oct 08, 2014 at 11:40:17AM +0200, Johannes Schindelin wrote: To make it easier to review and substantially easier to work on this patch series with Git, I opened a pull request on GitHub: https://github.com/msysgit/git/pull/264 1. I fail to see how using a tool that doesn't send emails about review comments is *easier* than just sending emails. 2. Please, do not hijack patchset discussion by moving it from git@ ML to GitHub comments. 3. And I repeat, my goal is to push this stuff in git.git, not in msysgit.git, not in git-for-windows.git, not in msys2.git, not in other 4k+ forks on GitHub. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [msysGit] [PATCH v4] MinGW(-W64) compilation
Hi Marat, On Wed, 8 Oct 2014, Marat Radchenko wrote: On Wed, Oct 08, 2014 at 11:40:17AM +0200, Johannes Schindelin wrote: To make it easier to review and substantially easier to work on this patch series with Git, I opened a pull request on GitHub: https://github.com/msysgit/git/pull/264 1. I fail to see how using a tool that doesn't send emails about review comments is *easier* than just sending emails. You probably missed how I commented on exact lines without you having to guess from the quoted context what part of your patches I am talking about. You probably also missed the fact that comments on rewritten commits automatically drop out of sight, decluttering the set of comments and making it obvious which comments have not been addressed yet. And finally, you probably also missed the fact that the official Git fork for Windows was asked to review your patches because Junio defers Windows-specific stuff to us. And as you refused to work against our integration branches (yes, we have two, because we are working towards switching to a more sustainable development environment, something you already mocked successfully), we had to rebase your work onto two branches, which is also substantially easier to do using GitHub rather than via mails. But I get it: you want to roll your own thing and not help us review it let alone make use of it. That's fine, we'll manage. 2. Please, do not hijack patchset discussion by moving it from git@ ML to GitHub comments. I mistook your work on Git and the fact that you have an account on GitHub for your willingness to collaborate on this effectively. My mistake, I apologize! 3. And I repeat, my goal is to push this stuff in git.git, not in msysgit.git, not in git-for-windows.git, not in msys2.git, not in other 4k+ forks on GitHub. Yes, your objection is noted. Junio, we'll take it from here, don't worry. Ciao, Johannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4] MinGW(-W64) compilation
Johannes Sixt j...@kdbg.org writes: Am 06.10.2014 um 07:17 schrieb Marat Radchenko: On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). Junio, ping? Sorry, I forgot to report that this updated series works now for me. The patches all look reasonable. I don't have an opinion on the restriction that MSVC 2010 can't be used anymore (path 08/14). So, is that an Ack, or would you prefer to cook this first in msysgit tree and then feed the result as part of This series is to shrink the difference between the mainline and msysgit later? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4] MinGW(-W64) compilation
Am 07.10.2014 um 21:01 schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: Am 06.10.2014 um 07:17 schrieb Marat Radchenko: On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). Junio, ping? Sorry, I forgot to report that this updated series works now for me. The patches all look reasonable. I don't have an opinion on the restriction that MSVC 2010 can't be used anymore (path 08/14). So, is that an Ack, or would you prefer to cook this first in msysgit tree and then feed the result as part of This series is to shrink the difference between the mainline and msysgit later? At this time, it's really just a works for me report, because I didn't look carefully at each patch. I may do that at some time later. If someone from the msysgit crew (I don't count myself to it) could report works for us, too, then the series could go into your tree right away, in my opinion. -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4] MinGW(-W64) compilation
Am 30.09.2014 um 09:02 schrieb Marat Radchenko: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). *Compilation* tested on: - MSVC - msysGit environment (twice) Hi Marat, I wanted to verify that on msysgit but some patches fail to apply cleanly. Did you also had to tweak the patches? If yes, are these tweaked patches still available somewhere? Thomas -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4] MinGW(-W64) compilation
On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote: Am 30.09.2014 um 09:02 schrieb Marat Radchenko: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). *Compilation* tested on: - MSVC - msysGit environment (twice) Hi Marat, I wanted to verify that on msysgit but some patches fail to apply cleanly. Did you also had to tweak the patches? If yes, are these tweaked patches still available somewhere? msysgit != git-for-windows, as msysgit folks say. msysgit is a development environment for git-for-windows. I tested my patches by applying them to git.git/master and building inside msysgit. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation
Am 06.10.2014 um 07:17 schrieb Marat Radchenko: On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). Junio, ping? Sorry, I forgot to report that this updated series works now for me. The patches all look reasonable. I don't have an opinion on the restriction that MSVC 2010 can't be used anymore (path 08/14). -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4] MinGW(-W64) compilation
On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). Junio, ping? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v4] MinGW(-W64) compilation
This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). *Compilation* tested on: - MSVC - msysGit environment (twice) - Linux cross-toolchain i686-pc-mingw32 - Linux cross-toolchain i686-w64-mingw32 - Linux cross-toolchain x86_64-w64-mingw32 Attention: in order to build on MinGW-W64, you need to use 'v1.x', 'v2.x' or 'sf/v3.x' branches from MinGW-W64 repo because MinGW-W64 releases do not yet have a fix for https://sourceforge.net/p/mingw-w64/bugs/397 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4] MinGW(-W64) compilation
On Tue, Sep 30, 2014 at 2:02 PM, Marat Radchenko ma...@slonopotamus.org wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!). *Compilation* tested on: - MSVC - msysGit environment (twice) - Linux cross-toolchain i686-pc-mingw32 Thanks. I always wanted to do this but never got around to clean up and submit. There's a problem with include order in Makefile. I don't want to specify CROSS_COMPILE or CC=mingw32-gcc from command line any time I make a build, so I put all those in config.mak. But because this file is included after config.mak.uname, all the default settings for MINGW is ignored. I'm not sure if we can move config.mak up before config.mak.uname. If we can't I'm ok with including a new file (config.mak.pre or something) before config.mak.uname. That would make make (no arguments) work for me. -- Duy -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
