From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 14 Jul 2006 12:31:05 +0000 (+0000)
Subject: Fix Debug build of _ssl.
X-Git-Tag: v2.5b3~253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7990b5b985d5619478b184acd62c49b2a4f24e6;p=python

Fix Debug build of _ssl.
---

diff --git a/PCbuild/_ssl.vcproj b/PCbuild/_ssl.vcproj
index 3395660a05..bc69ee8862 100644
--- 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 7065bb2ac0..82572ed18a 100644
--- a/PCbuild/build_ssl.bat
+++ b/PCbuild/build_ssl.bat
@@ -1,5 +1,10 @@
 @echo off
-cd
-if not defined HOST_PYTHON set HOST_PYTHON=python
+if not defined HOST_PYTHON (
+  if %1 EQU Debug (
+    set HOST_PYTHON=python_d.exe
+  ) ELSE (
+    set HOST_PYTHON=python.exe
+  )
+)
 %HOST_PYTHON% build_ssl.py %1 %2
 
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 7b4c2efc95..d4beee5416 100644
--- 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"