[Python-checkins] cpython (3.5): Fixes warnings when building python3.dll due to the .def file accumulating

steve.dower python-checkins at python.org
Fri Jul 3 21:21:47 CEST 2015


https://hg.python.org/cpython/rev/1d0ec12b1e03
changeset:   96781:1d0ec12b1e03
branch:      3.5
parent:      96779:cb1aafc9ad7e
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri Jul 03 09:08:47 2015 -0700
summary:
  Fixes warnings when building python3.dll due to the .def file accumulating multiple copies of each line.
Adds shebang line to prepare_ssl so it will run with py.exe.

files:
  PCbuild/prepare_ssl.py     |  1 +
  PCbuild/python3dll.vcxproj |  4 ++--
  2 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
--- a/PCbuild/prepare_ssl.py
+++ b/PCbuild/prepare_ssl.py
@@ -1,3 +1,4 @@
+#! /usr/bin/env python3
 # Script for preparing OpenSSL for building on Windows.
 # Uses Perl to create nmake makefiles and otherwise prepare the way
 # for building on 32 or 64 bit platforms.
diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj
--- a/PCbuild/python3dll.vcxproj
+++ b/PCbuild/python3dll.vcxproj
@@ -109,7 +109,7 @@
       </_Lines>
     </ItemGroup>
     <MakeDir Directories="$(IntDir)" />
-    <WriteLinesToFile File="$(IntDir)python3_d.def" Lines="@(_Lines->'%(New)')" />
+    <WriteLinesToFile File="$(IntDir)python3_d.def" Lines="@(_Lines->'%(New)')" Overwrite="true" />
   </Target>
   
   <Target Name="BuildStubDef" BeforeTargets="PreLinkEvent" Inputs="..\PC\python3.def" Outputs="$(IntDir)python3stub.def">
@@ -132,7 +132,7 @@
       <_Lines Include="@(_Symbols->'%(Symbol)')" />
     </ItemGroup>
     <MakeDir Directories="$(IntDir)" />
-    <WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" />
+    <WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" Overwrite="true" />
   </Target>
   <Target Name="_CleanStubDef" BeforeTargets="CoreClean">
     <ItemGroup>

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


More information about the Python-checkins mailing list