Fix Debug build of _ssl.

diff --git a/PCbuild/_ssl.vcproj b/PCbuild/_ssl.vcproj
index 3395660a05b1031fab2714e3336fcfab61ef114e..bc69ee8862b92b55d1fb58304ddd230a40067dd9 100644 (file)
--- a/PCbuild/_ssl.vcproj
+++ b/PCbuild/_ssl.vcproj
@@ -22,7 +22,7 @@
                        <Tool
                                Name="VCNMakeTool"
                                BuildCommandLine="build_ssl.bat $(ConfigurationName)"
-                               ReBuildCommandLine="build_ssl.bat -a $(ConfigurationName)"
+                               ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a"
                                CleanCommandLine="echo Nothing to do"
                                Output="_ssl.pyd"/>
                </Configuration>
@@ -36,7 +36,7 @@
                        <Tool
                                Name="VCNMakeTool"
                                BuildCommandLine="build_ssl.bat $(ConfigurationName)"
-                               ReBuildCommandLine="build_ssl.bat -a $(ConfigurationName)"
+                               ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a"
                                CleanCommandLine="echo Nothing to do"
                                Output="_ssl_d.pyd"/>
                </Configuration>
@@ -50,7 +50,7 @@
                        <Tool
                                Name="VCNMakeTool"
                                BuildCommandLine="build_ssl.bat $(ConfigurationName)"
-                               ReBuildCommandLine="build_ssl.bat -a $(ConfigurationName)"
+                               ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a"
                                CleanCommandLine="echo Nothing to do"
                                Output="_ssl.pyd"/>
                </Configuration>
@@ -64,7 +64,7 @@
                        <Tool
                                Name="VCNMakeTool"
                                BuildCommandLine="build_ssl.bat $(ConfigurationName)"
-                               ReBuildCommandLine="build_ssl.bat -a $(ConfigurationName)"
+                               ReBuildCommandLine="build_ssl.bat $(ConfigurationName) -a"
                                CleanCommandLine="echo Nothing to do"
                                Output="_ssl.pyd"/>
                </Configuration>

diff --git a/PCbuild/build_ssl.bat b/PCbuild/build_ssl.bat
index 7065bb2ac00f5f518bf2600e7ec02bcd32e26d2a..82572ed18ae53c82a307c6cdf03db55fac7649d6 100644 (file)
--- a/PCbuild/build_ssl.bat
+++ b/PCbuild/build_ssl.bat
@@ -1,5 +1,10 @@
 @echo off\r
-cd\r
-if not defined HOST_PYTHON set HOST_PYTHON=python\r
+if not defined HOST_PYTHON (\r
+  if %1 EQU Debug (\r
+    set HOST_PYTHON=python_d.exe\r
+  ) ELSE (\r
+    set HOST_PYTHON=python.exe\r
+  )\r
+)\r
 %HOST_PYTHON% build_ssl.py %1 %2\r
 \r

diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 7b4c2efc958105f43bb7f781831c5da7e44ffa13..d4beee54169bdf059252996958f4e3d98385b6d2 100644 (file)
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -113,24 +113,24 @@ def run_configure(configure, do_script):
 
 def main():
     build_all = "-a" in sys.argv
-    if sys.argv[-1] == "Release":
+    if sys.argv[1] == "Release":
         arch = "x86"
         debug = False
         configure = "VC-WIN32"
         makefile = "32.mak"
-    elif sys.argv[-1] == "Debug":
+    elif sys.argv[1] == "Debug":
         arch = "x86"
         debug = True
         configure = "VC-WIN32"
         makefile="d32.mak"
-    elif sys.argv[-1] == "ReleaseItanium":
+    elif sys.argv[1] == "ReleaseItanium":
         arch = "ia64"
         debug = False
         configure = "VC-WIN64I"
         do_script = "ms\\do_win64i"
         makefile = "ms\\nt.mak"
         os.environ["VSEXTCOMP_USECL"] = "MS_ITANIUM"
-    elif sys.argv[-1] == "ReleaseAMD64":
+    elif sys.argv[1] == "ReleaseAMD64":
         arch="amd64"
         debug=False
         configure = "VC-WIN64A"