Merged revisions 59605-59624 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r59606 | georg.brandl | 2007-12-29 11:57:00 +0100 (Sat, 29 Dec 2007) | 2 lines Some cleanup in the docs. ........ r59611 | martin.v.loewis | 2007-12-29 19:49:21 +0100 (Sat, 29 Dec 2007) | 2 lines Bug #1699: Define _BSD_SOURCE only on OpenBSD. ........ r59612 | raymond.hettinger | 2007-12-29 23:09:34 +0100 (Sat, 29 Dec 2007) | 1 line Simpler documentation for itertools.tee(). Should be backported. ........ r59613 | raymond.hettinger | 2007-12-29 23:16:24 +0100 (Sat, 29 Dec 2007) | 1 line Improve docs for itertools.groupby(). The use of xrange(0) to create a unique object is less obvious than object(). ........ r59620 | christian.heimes | 2007-12-31 15:47:07 +0100 (Mon, 31 Dec 2007) | 3 lines Added wininst-9.0.exe executable for VS 2008 Integrated bdist_wininst into PCBuild9 directory ........ r59621 | christian.heimes | 2007-12-31 15:51:18 +0100 (Mon, 31 Dec 2007) | 1 line Moved PCbuild directory to PC/VS7.1 ........ r59622 | christian.heimes | 2007-12-31 15:59:26 +0100 (Mon, 31 Dec 2007) | 1 line Fix paths for build bot ........ r59623 | christian.heimes | 2007-12-31 16:02:41 +0100 (Mon, 31 Dec 2007) | 1 line Fix paths for build bot, part 2 ........ r59624 | christian.heimes | 2007-12-31 16:18:55 +0100 (Mon, 31 Dec 2007) | 1 line Renamed PCBuild9 directory to PCBuild ........

--- a/PCbuild/env.bat	Mon Dec 31 03:07:24 2007 +0000
+++ b/PCbuild/env.bat	Mon Dec 31 16:14:33 2007 +0000
@@ -1,22 +1,5 @@
 @echo off
-rem Set these values according to where you installed the software
-rem You need to install the necessary bits mentioned in:
-rem http://wiki.python.org/moin/Building_Python_with_the_free_MS_C_Toolkit
-
-set TOOLKIT=%ProgramFiles%\Microsoft Visual C++ Toolkit 2003
-set SDK=%ProgramFiles%\Microsoft Platform SDK for Windows Server 2003 R2
-set NET=%ProgramFiles%\Microsoft Visual Studio .NET 2003
-set NANT=%ProgramFiles%\Nant
-
-set PATH=%TOOLKIT%\bin;%PATH%;%SDK%\Bin\Win64;%NANT%\bin;%SDK%\bin
-set INCLUDE=%TOOLKIT%\include;%SDK%\Include;%INCLUDE%
-set LIB=%TOOLKIT%\lib;%NET%\VC7\lib;%SDK%\lib;%LIB%
-
-echo Build environment for Python
-echo TOOLKIT=%TOOLKIT%
-echo SDK=%SDK%
-echo NET=%NET%
-echo NANT=%NANT%
-echo Commands:
-echo * build 
-echo * rt
+set VS9=%ProgramFiles%\Microsoft Visual Studio 9.0
+echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
+echo.
+call "%VS9%\VC\vcvarsall.bat" %1