[Python-checkins] r50633 - python/trunk/PCbuild/_ssl.vcproj python/trunk/PCbuild/build_ssl.bat python/trunk/PCbuild/build_ssl.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Jul 14 14:31:05 2006
New Revision: 50633

Modified:
   python/trunk/PCbuild/_ssl.vcproj
   python/trunk/PCbuild/build_ssl.bat
   python/trunk/PCbuild/build_ssl.py
Log:
Fix Debug build of _ssl.

Modified: python/trunk/PCbuild/_ssl.vcproj
==============================================================================
--- python/trunk/PCbuild/_ssl.vcproj	(original)
+++ python/trunk/PCbuild/_ssl.vcproj	Fri Jul 14 14:31:05 2006
@@ -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>

Modified: python/trunk/PCbuild/build_ssl.bat
==============================================================================
--- python/trunk/PCbuild/build_ssl.bat	(original)
+++ python/trunk/PCbuild/build_ssl.bat	Fri Jul 14 14:31:05 2006
@@ -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
 

Modified: python/trunk/PCbuild/build_ssl.py
==============================================================================
--- python/trunk/PCbuild/build_ssl.py	(original)
+++ python/trunk/PCbuild/build_ssl.py	Fri Jul 14 14:31:05 2006
@@ -113,24 +113,24 @@
 
 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"