Kaydet (Commit) c7990b5b authored tarafından Martin v. Löwis's avatar Martin v. Löwis

Fix Debug build of _ssl.

üst 1def4faf
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<Tool <Tool
Name="VCNMakeTool" Name="VCNMakeTool"
BuildCommandLine="build_ssl.bat $(ConfigurationName)" BuildCommandLine="build_ssl.bat $(ConfigurationName)"
ReBuildCommandLine="build_ssl.bat -a $(ConfigurationName)" ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a"
CleanCommandLine="echo Nothing to do" CleanCommandLine="echo Nothing to do"
Output="_ssl.pyd"/> Output="_ssl.pyd"/>
</Configuration> </Configuration>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<Tool <Tool
Name="VCNMakeTool" Name="VCNMakeTool"
BuildCommandLine="build_ssl.bat $(ConfigurationName)" BuildCommandLine="build_ssl.bat $(ConfigurationName)"
ReBuildCommandLine="build_ssl.bat -a $(ConfigurationName)" ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a"
CleanCommandLine="echo Nothing to do" CleanCommandLine="echo Nothing to do"
Output="_ssl_d.pyd"/> Output="_ssl_d.pyd"/>
</Configuration> </Configuration>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<Tool <Tool
Name="VCNMakeTool" Name="VCNMakeTool"
BuildCommandLine="build_ssl.bat $(ConfigurationName)" BuildCommandLine="build_ssl.bat $(ConfigurationName)"
ReBuildCommandLine="build_ssl.bat -a $(ConfigurationName)" ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a"
CleanCommandLine="echo Nothing to do" CleanCommandLine="echo Nothing to do"
Output="_ssl.pyd"/> Output="_ssl.pyd"/>
</Configuration> </Configuration>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<Tool <Tool
Name="VCNMakeTool" Name="VCNMakeTool"
BuildCommandLine="build_ssl.bat $(ConfigurationName)" BuildCommandLine="build_ssl.bat $(ConfigurationName)"
ReBuildCommandLine="build_ssl.bat -a $(ConfigurationName)" ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a"
CleanCommandLine="echo Nothing to do" CleanCommandLine="echo Nothing to do"
Output="_ssl.pyd"/> Output="_ssl.pyd"/>
</Configuration> </Configuration>
......
@echo off @echo off
cd if not defined HOST_PYTHON (
if not defined HOST_PYTHON set HOST_PYTHON=python if %1 EQU Debug (
set HOST_PYTHON=python_d.exe
) ELSE (
set HOST_PYTHON=python.exe
)
)
%HOST_PYTHON% build_ssl.py %1 %2 %HOST_PYTHON% build_ssl.py %1 %2
...@@ -113,24 +113,24 @@ def run_configure(configure, do_script): ...@@ -113,24 +113,24 @@ def run_configure(configure, do_script):
def main(): def main():
build_all = "-a" in sys.argv build_all = "-a" in sys.argv
if sys.argv[-1] == "Release": if sys.argv[1] == "Release":
arch = "x86" arch = "x86"
debug = False debug = False
configure = "VC-WIN32" configure = "VC-WIN32"
makefile = "32.mak" makefile = "32.mak"
elif sys.argv[-1] == "Debug": elif sys.argv[1] == "Debug":
arch = "x86" arch = "x86"
debug = True debug = True
configure = "VC-WIN32" configure = "VC-WIN32"
makefile="d32.mak" makefile="d32.mak"
elif sys.argv[-1] == "ReleaseItanium": elif sys.argv[1] == "ReleaseItanium":
arch = "ia64" arch = "ia64"
debug = False debug = False
configure = "VC-WIN64I" configure = "VC-WIN64I"
do_script = "ms\\do_win64i" do_script = "ms\\do_win64i"
makefile = "ms\\nt.mak" makefile = "ms\\nt.mak"
os.environ["VSEXTCOMP_USECL"] = "MS_ITANIUM" os.environ["VSEXTCOMP_USECL"] = "MS_ITANIUM"
elif sys.argv[-1] == "ReleaseAMD64": elif sys.argv[1] == "ReleaseAMD64":
arch="amd64" arch="amd64"
debug=False debug=False
configure = "VC-WIN64A" configure = "VC-WIN64A"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment