mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 59605-59624 via svnmerge from

Browse source 
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
........
This commit is contained in:
Christian Heimes 2007-12-31 16:14:33 +00:00
parent 862543aa85
commit 5b5e81c637
241 changed files with 19189 additions and 19152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/buildbot/build-amd64.bat
View file

@ -3,4 +3,4 @@ setlocal
cmd /c Tools\buildbot\external-amd64.bat
call "%VS71COMNTOOLS%vsvars32.bat"
REM cmd /q/c Tools\buildbot\kill_python.bat
devenv.com /build ReleaseAMD64 PCbuild\pcbuild.sln
devenv.com /build ReleaseAMD64 PC\VS7.1\pcbuild.sln

2
Tools/buildbot/build.bat
View file

@ -2,4 +2,4 @@
cmd /c Tools\buildbot\external.bat
call "%VS71COMNTOOLS%vsvars32.bat"
cmd /q/c Tools\buildbot\kill_python.bat
devenv.com /useenv /build Debug PCbuild\pcbuild.sln
devenv.com /useenv /build Debug PC\VS7.1\pcbuild.sln

2
Tools/buildbot/buildmsi.bat
View file

@ -9,7 +9,7 @@ if not exist ..\db-4.4.20\build_win32\release\libdb44s.lib (
@rem build Python
cmd /q/c Tools\buildbot\kill_python.bat
devenv.com /useenv /build Release PCbuild\pcbuild.sln
devenv.com /useenv /build Release PC\VS7.1\pcbuild.sln
@rem build the documentation
bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'

2
Tools/buildbot/clean-amd64.bat
View file

@ -1,6 +1,6 @@
@rem Used by the buildbot "clean" step.
call "%VS71COMNTOOLS%vsvars32.bat"
cd PCbuild
cd PC\VS7.1
@echo Deleting .pyc/.pyo files ...
del /s Lib\*.pyc Lib\*.pyo
devenv.com /clean ReleaseAMD64 pcbuild.sln

2
Tools/buildbot/clean.bat
View file

@ -1,6 +1,6 @@
@rem Used by the buildbot "clean" step.
call "%VS71COMNTOOLS%vsvars32.bat"
cd PCbuild
cd PC\VS7.1
@echo Deleting .pyc/.pyo files ...
del /s Lib\*.pyc Lib\*.pyo
devenv.com /clean Release pcbuild.sln

8
Tools/buildbot/kill_python.c
View file

@ -1,4 +1,4 @@
/* This program looks for processes which have build\PCbuild\python.exe
/* This program looks for processes which have build\PC\VS7.1\python.exe
in their path and terminates them. */
#include <windows.h>
#include <psapi.h>
@ -46,14 +46,14 @@ int main()
/* Check if we are running a buildbot version of Python.
On Windows, this will always be a debug build from the
PCbuild directory. build\\PCbuild\\python_d.exe
PC\VS7.1 directory. build\\PC\\VS7.1\\python_d.exe
On Cygwin, the pathname is similar to other Unixes.
Use \\build\\python.exe to ensure we don't match
PCbuild\\python.exe which could be a normal instance
PC\\VS7.1\\python.exe which could be a normal instance
of Python running on vanilla Windows.
*/
if ((strstr(path, "build\\pcbuild\\python_d.exe") != NULL) ||
if ((strstr(path, "build\\pc\\vs7.1\\python_d.exe") != NULL) ||
(strstr(path, "\\build\\python.exe") != NULL)) {
printf("Terminating %s (pid %d)\n", path, pids[i]);
if (!TerminateProcess(hProcess, 1)) {

2
Tools/buildbot/test-amd64.bat
View file

@ -1,3 +1,3 @@
@rem Used by the buildbot "test" step.
cd PCbuild
cd PC\VS7.1
call rt.bat -q -uall -rw

2
Tools/buildbot/test.bat
View file

@ -1,3 +1,3 @@
@rem Used by the buildbot "test" step.
cd PCbuild
cd PC\VS7.1
call rt.bat -d -q -uall -rw -n

2
Tools/msi/msi.py
View file

@ -27,7 +27,7 @@ have_tcl = True
# Where is sqlite3.dll located, relative to srcdir?
sqlite_dir = "../sqlite-source-3.3.4"
# path to PCbuild directory
PCBUILD="PCbuild"
PCBUILD="PC/VS7.1"
#PCBUILD="PCbuild9"
# msvcrt version
MSVCR = "71"