[Python-checkins] cpython: Issue #23461: Normalise line endings when comparing old and new contents of

[steve.dower]

https://hg.python.org/cpython/rev/f9a43e2a3877
changeset:   94607:f9a43e2a3877
user:        Steve Dower <steve.dower at microsoft.com>
date:        Sat Feb 14 09:38:19 2015 -0800
summary:
  Issue #23461: Normalise line endings when comparing old and new contents of importlib.h

files:
  PCbuild/_freeze_importlib.vcxproj |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/PCbuild/_freeze_importlib.vcxproj b/PCbuild/_freeze_importlib.vcxproj
--- a/PCbuild/_freeze_importlib.vcxproj
+++ b/PCbuild/_freeze_importlib.vcxproj
@@ -85,8 +85,8 @@
     <Exec Command='"$(TargetPath)" "$(PySourcePath)Lib\importlib\_bootstrap.py" "$(IntDir)importlib.g.h"' />
     
     <PropertyGroup>
-      <_OldContent Condition="Exists('$(PySourcePath)Python\importlib.h')">$([System.IO.File]::ReadAllText('$(PySourcePath)Python\importlib.h'))</_OldContent>
-      <_NewContent Condition="Exists('$(IntDir)importlib.g.h')">$([System.IO.File]::ReadAllText('$(IntDir)importlib.g.h'))</_NewContent>
+      <_OldContent Condition="Exists('$(PySourcePath)Python\importlib.h')">$([System.IO.File]::ReadAllText('$(PySourcePath)Python\importlib.h').Replace(`&#x0D;&#x0A;`, `&#x0A;`))</_OldContent>
+      <_NewContent Condition="Exists('$(IntDir)importlib.g.h')">$([System.IO.File]::ReadAllText('$(IntDir)importlib.g.h').Replace(`&#x0D;&#x0A;`, `&#x0A;`))</_NewContent>
     </PropertyGroup>
     
     <Copy SourceFiles="$(IntDir)importlib.g.h"

-- 
Repository URL: https://hg.python.org/cpython