summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-07-03 19:21:29 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-07-03 19:21:29 (GMT)
commit0a34c496039a2bdc3d48c2a062bb0fbffcffa491 (patch)
tree31e97208263b34ad6767062d4f193a84c2025eae
parentd48fb485d9d6597b1048f6131a28cb14979349af (diff)
parentac2bd5b1e8c5d8ee04c12ef6f34f1c9f1f8338c0 (diff)
downloadcpython-0a34c496039a2bdc3d48c2a062bb0fbffcffa491.zip
cpython-0a34c496039a2bdc3d48c2a062bb0fbffcffa491.tar.gz
cpython-0a34c496039a2bdc3d48c2a062bb0fbffcffa491.tar.bz2
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.
-rw-r--r--PCbuild/prepare_ssl.py1
-rw-r--r--PCbuild/python3dll.vcxproj4
2 files changed, 3 insertions, 2 deletions
diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
index 671e526..4203dab 100644
--- 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
index b03d09f..18ff4a8 100644
--- 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>