[Python-3000-checkins] r61661 - in python/branches/py3k: Tools/buildbot/build-amd64.bat Tools/buildbot/build.bat Tools/buildbot/clean-amd64.bat Tools/buildbot/external-amd64.bat

[trent.nelson]

Author: trent.nelson
Date: Thu Mar 20 02:18:35 2008
New Revision: 61661

Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Tools/buildbot/build-amd64.bat
   python/branches/py3k/Tools/buildbot/build.bat
   python/branches/py3k/Tools/buildbot/clean-amd64.bat
   python/branches/py3k/Tools/buildbot/external-amd64.bat
Log:
Merged revisions 61639 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61639 | trent.nelson | 2008-03-19 16:11:55 -0500 (Wed, 19 Mar 2008) | 6 lines
  
  Fix the x64 Windows build environment used by the buildbots.  %VS90COMNTOOLS%\vsvars32.bat is fine for 32-bit builds, but doesn't work for x64 builds, regardless of /MACHINE:AMD64 and /USECL:MS_OPTERON flags passed to cl.exe.  Launch the x86_64 cross compilation environment via '%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat x86_amd64'.  I don't have access to any systems *without* Visual Studio 2008 Professional installed (i.e. just Express Edition), so I can't test if x64 compilation works w/ VS Express at the moment.
  
  Additionally, force a clean in our build.bat files before building, just whilst we're going through these build system updates.
  
  And finally, add in the missing MACHINE=AMD64 option to our Tcl/Tk x64 build.
........


Modified: python/branches/py3k/Tools/buildbot/build-amd64.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/build-amd64.bat	(original)
+++ python/branches/py3k/Tools/buildbot/build-amd64.bat	Thu Mar 20 02:18:35 2008
@@ -1,5 +1,6 @@
 @rem Used by the buildbot "compile" step.
 cmd /c Tools\buildbot\external-amd64.bat
-call "%VS90COMNTOOLS%vsvars32.bat"
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 REM cmd /q/c Tools\buildbot\kill_python.bat
+cmd /c Tools\buildbot\clean-amd64.bat
 vcbuild PCbuild\pcbuild.sln "Debug|x64"

Modified: python/branches/py3k/Tools/buildbot/build.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/build.bat	(original)
+++ python/branches/py3k/Tools/buildbot/build.bat	Thu Mar 20 02:18:35 2008
@@ -2,5 +2,6 @@
 cmd /c Tools\buildbot\external.bat
 call "%VS90COMNTOOLS%vsvars32.bat"
 cmd /q/c Tools\buildbot\kill_python.bat
+cmd /c Tools\buildbot\clean.bat
 vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
 

Modified: python/branches/py3k/Tools/buildbot/clean-amd64.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/clean-amd64.bat	(original)
+++ python/branches/py3k/Tools/buildbot/clean-amd64.bat	Thu Mar 20 02:18:35 2008
@@ -1,5 +1,5 @@
 @rem Used by the buildbot "clean" step.
-call "%VS90COMNTOOLS%vsvars32.bat"
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 cd PCbuild
 @echo Deleting .pyc/.pyo files ...
 del /s Lib\*.pyc Lib\*.pyo

Modified: python/branches/py3k/Tools/buildbot/external-amd64.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/external-amd64.bat	(original)
+++ python/branches/py3k/Tools/buildbot/external-amd64.bat	Thu Mar 20 02:18:35 2008
@@ -2,16 +2,16 @@
 
 @rem Assume we start inside the Python source directory
 call "Tools\buildbot\external-common.bat"
-call "%VS90COMNTOOLS%\vsvars32.bat"
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 
 if not exist tcltk64\bin\tcl84g.dll (
     cd tcl-8.4.18.2\win
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk64 clean all install
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
     cd ..\..
 )
 
 if not exist tcltk64\bin\tk84g.dll (
     cd tk-8.4.18.1\win    
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.4.18.2 clean all install
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.4.18.2 clean all install
     cd ..\..
 )