]> granicus.if.org Git - python/commitdiff
Issue #23461: Normalise line endings when comparing old and new contents of importlib.h
authorSteve Dower <steve.dower@microsoft.com>
Sat, 14 Feb 2015 17:38:19 +0000 (09:38 -0800)
committerSteve Dower <steve.dower@microsoft.com>
Sat, 14 Feb 2015 17:38:19 +0000 (09:38 -0800)
PCbuild/_freeze_importlib.vcxproj

index 7f4e419348375340a795fa6e9a1a92d56d16e714..f7714c003af9e00d4ab65f1e403e91da666feaa2 100644 (file)
@@ -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"