[issue23461] Building on windows modifies importlib.h

2015-02-14 Thread Zachary Ware
Zachary Ware added the comment: Thanks, Steve! -- assignee: -> steve.dower stage: -> resolved ___ Python tracker ___ ___ Python-bugs

[issue23461] Building on windows modifies importlib.h

2015-02-14 Thread Steve Dower
Steve Dower added the comment: The changeset will skip updating importlib.h if the only change is line endings, but if there are other changes it will be updated to a CRLF file. This will be fine if the eol extension is enabled, and h.p.o will reject pushes that have CRLF line endings. Howeve

[issue23461] Building on windows modifies importlib.h

2015-02-14 Thread Roundup Robot
Roundup Robot added the comment: New changeset f9a43e2a3877 by Steve Dower in branch 'default': Issue #23461: Normalise line endings when comparing old and new contents of importlib.h https://hg.python.org/cpython/rev/f9a43e2a3877 -- nosy: +python-dev __

[issue23461] Building on windows modifies importlib.h

2015-02-14 Thread Paul Moore
Paul Moore added the comment: Martin, thanks for the clarification. When I said "I don't use it much" what I meant was that I've never had it enabled, and for all of the repositories I use, not doing so has never been a problem (until now). In contrast, git's autocrlf feature, which is enabled

[issue23461] Building on windows modifies importlib.h

2015-02-14 Thread Martin v . Löwis
Martin v. Löwis added the comment: Paul: wrt. your statement "eol extension tomorrow. I don't really use it much,". This can't be really true: either you use it, or you don't. If you use it at all, then you also use it MUCH: Python is a heavy user of the eol extension, and the entire Python hg

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Paul Moore
Paul Moore added the comment: Correction. Looks like if I enable the eol extension, then hg revert importlib.h, then rebuild, the problem then goes away. So basically you need the eol extension enabled *before* you update/clone your checkout. -- __

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Paul Moore
Paul Moore added the comment: No, enabling the eol extension didn't fix it :-( -- ___ Python tracker ___ ___ Python-bugs-list mailing

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Mark Lawrence
Mark Lawrence added the comment: I noticed a few days ago that this file had changed as I got a merge conflict using the tortoisehg sychronize command. At the time I didn't think much of it and believe I simply let hg sort it out. The changeset was 8ab6b404248c #21295. -- nosy: +Brea

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Zachary Ware
Zachary Ware added the comment: The other option would be to change _freeze_importlib to force it to use \n instead of \r\n; I'm not sure which change would be harder to do. Paul: fair enough; I've just found that keeping eol enabled reduces headaches due to line endings to almost nothing, just

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Paul Moore
Paul Moore added the comment: I'm just about finished for the night but I'll try the eol extension tomorrow. I don't really use it much, though, my practice is generally to make all my tools use LF. I certainly didn't do anything that would change that file, so something in the build must be w

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Steve Dower
Steve Dower added the comment: It's possible, but the eol extension is the best way to handle it. Doing the comparison is relatively easy (we can just strip all '\r' and '\n' characters and compare), but if it has changed, it's much harder to update the new file to match whatever the old file

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Zachary Ware
Zachary Ware added the comment: Ah ha. Do you have the hg eol extension enabled? If not, you probably should; it makes for far fewer headaches on Windows, and should make this issue go away. We should probably try to mitigate the problem anyway; Steve, how hard would it be to change the 'see i

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Paul Moore
Paul Moore added the comment: Ah. It's 4K lines of everything changing. Looks like it might be an EOL issue. The build seems to be changing it from LF line endings to CRLF line endings. -- ___ Python tracker _

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Steve Dower
Steve Dower added the comment: Windows is probably the only platform that detects when _freeze_importlib makes a change and aborts the build :) I'd be interested to see what the diff is though. My guess is some of the recent marshal changes may have affected the output. -- __

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Zachary Ware
Zachary Ware added the comment: What does the diff to importlib.h look like? Does it look like a real change to importlib or is it something innocuous like a change in whitespace or the path separator in the heading? -- components: +Build, Windows nosy: +tim.golden, zach.ware ___

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Eric Snow
Eric Snow added the comment: This implies to me that someone didn't include importlib.h in their commit when they changed something that required it to be rebuilt. However, if it's a Windows-only thing then perhaps there is something else afoot. Steve? -- nosy: +brett.cannon, eric.sn

[issue23461] Building on windows modifies importlib.h

2015-02-13 Thread Paul Moore
New submission from Paul Moore: When building Python (cpython repository, tip revision on the default branch) using Visual Studio 2015 (version downloaded 12/02/2015) I get a message in the build: C:\Work\Projects\cpython\PCbuild\_freeze_importlib.vcxproj(98,5): error : importlib.h has been u