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
........

1 files changed, 15 insertions, 48 deletions

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 5eeb123..9bc8186 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -1,50 +1,17 @@
 @echo off
-setlocal
-
-set target=end
-
-if "%1"=="makeinfo" goto makeinfo
-if "%1"=="clean" goto clean
-if "%1"=="build" goto build
-if "%1"=="setargv" goto setargv
-if "%1"=="" goto build
-
-echo Usage: build.bat build
-echo        build.bat clean
-echo        build.bat setargv
-goto end
-
-:clean
-del *.pyd *.exe *.dll *.exp *.lib *.pdb *.o
-rmdir /S /Q temp
-rmdir /S /Q x86-temp-release 
-goto %target%
+rem A batch program to build or rebuild a particular configuration.
+rem just for convenience.
 
-:setargv
-cl /c /I"%SDK%\src\crt" /MD /D_CRTBLD "%SDK%\src\crt\setargv.c"
-if not exist setargv.obj echo An error occured & goto end
-echo copy setargv.obj "%SDK%\Lib"
-copy setargv.obj "%SDK%\Lib"
-del setargv.obj
-goto %target%
-
-:makeinfo
-nant -buildfile:python.build all
-lib /def: x86-temp-release\make_buildinfo\make_buildinfo.obj
-lib /def: x86-temp-release\make_versioninfo\make_versioninfo.obj
-goto %target%
-
-:build
-if not exist make_buildinfo.lib set target=realbuild & goto makeinfo
-if not exist make_versioninfo.lib set target=realbuild & goto makeinfo
-if exist "%SDK%\Lib\setargv.obj" goto realbuild
-echo !!!!!!!!
-echo setargv.obj is missing. Please call build setargv
-echo !!!!!!!!
-
-:realbuild
-if not exist sqlite3.dll copy ..\..\sqlite-source-3.3.4\sqlite3.dll .
-nant -buildfile:python.build all
-goto end
-
-:end
+setlocal
+set platf=Win32
+set conf=Release
+set build=/build
+
+:CheckOpts
+if "%1"=="-c" (set conf=%2)     & shift & shift & goto CheckOpts
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
+if "%1"=="-r" (set build=/rebuild)    & shift & goto CheckOpts
+
+set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"
+echo %cmd%
+%cmd%