Commit Graph

79 Commits

Author SHA1 Message Date
Antoine Pitrou 41347fe011 In the Windows clean script for buildbots, also clear the build dir
(so that stale test files, which can be very large, get wiped out)
2011-03-26 22:08:21 +01:00
Georg Brandl faa9ad2a46 Add updated .hgeol file and fix newlines in the 2.7 branch. 2011-03-05 15:06:13 +01:00
R. David Murray 561b96f98c Merged revisions 86542,87136,87216,87221,87228,87256,87337-87338,87372,87516,87571,88164 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86542 | r.david.murray | 2010-11-19 22:48:58 -0500 (Fri, 19 Nov 2010) | 2 lines

  Make test class name unique so that both test classes run.
........
  r87136 | r.david.murray | 2010-12-08 17:53:00 -0500 (Wed, 08 Dec 2010) | 6 lines

  Have script_helper._assert_python strip refcount strings from stderr.

  This makes the output of the function and those that depend on it
  independent of whether or not they are being run under a debug
  build.
........
  r87216 | r.david.murray | 2010-12-13 17:50:30 -0500 (Mon, 13 Dec 2010) | 2 lines

  #10698: fix typo in example.
........
  r87221 | r.david.murray | 2010-12-13 19:55:46 -0500 (Mon, 13 Dec 2010) | 4 lines

  #10699: fix docstring for tzset: it does not take a parameter

  Thanks to Garrett Cooper for the fix.
........
  r87228 | r.david.murray | 2010-12-13 21:25:43 -0500 (Mon, 13 Dec 2010) | 2 lines

  Turn on regrtest -W (rerun immediately) option for Windows, too.
........
  r87256 | r.david.murray | 2010-12-14 21:19:14 -0500 (Tue, 14 Dec 2010) | 2 lines

  #10705: document what the values of debuglevel are and mean.
........
  r87337 | r.david.murray | 2010-12-17 11:11:40 -0500 (Fri, 17 Dec 2010) | 2 lines

  #10559: provide instructions for accessing sys.argv when first mentioned.
........
  r87338 | r.david.murray | 2010-12-17 11:29:07 -0500 (Fri, 17 Dec 2010) | 2 lines

  #10454: clarify the compileall docs and help messages.
  [changes to compileall.py were not backported, only the doc changes]
........
  r87372 | r.david.murray | 2010-12-18 11:39:06 -0500 (Sat, 18 Dec 2010) | 2 lines

  #10728: the default for printing help is sys.stdout, not stderr.
........
  r87516 | r.david.murray | 2010-12-27 15:09:32 -0500 (Mon, 27 Dec 2010) | 5 lines

  #7056: runtest and runtest_inner don't use testdir, so drop it from their sigs

  I've only tested regular runs and -j runs.  If I've broken anything
  else I'm sure I'll hear about it sooner or later.
........
  r87571 | r.david.murray | 2010-12-29 14:06:48 -0500 (Wed, 29 Dec 2010) | 2 lines

  Fix same typo in docs.
........
  r88164 | r.david.murray | 2011-01-24 14:34:58 -0500 (Mon, 24 Jan 2011) | 12 lines

  #10960: fix 'stat' links, link to lstat from stat, general tidy of stat doc.

  Original patch by Michal Nowikowski, with some additions and wording
  fixes by me.

  I changed the wording from 'Performs a stat system call' to 'Performs
  the equivalent of a stat system call', since on Windows there are no
  stat/lstat system calls involved.  I also extended Michal's breakout
  of the attributes into a list to the other paragraphs, and rearranged
  the order of the paragraphs in the 'stat' docs to make it flow
  better and put it in what I think is a more logical/useful order.
........
2011-02-11 17:25:54 +00:00
Hirokazu Yamamoto 3b47b6c04c Sorry, I committed into wrong branch. So reverted it. 2010-09-28 08:19:18 +00:00
Hirokazu Yamamoto ba0c84371e Run test_ttk_guionly in verbose mode. 2010-09-28 07:35:56 +00:00
Martin v. Löwis f477b93d9d Update Windows build to sqlite 3.6.21. 2010-01-02 09:25:21 +00:00
Martin v. Löwis 55e1a697ab Switch to OpenSSL 0.9.8l. 2009-12-21 19:27:15 +00:00
Martin v. Löwis 0306894fb1 Fix typo. 2009-11-26 08:42:05 +00:00
Trent Nelson 6e7e137cff Merged revisions 64368-64369 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/tnelson-trunk-bsddb-47-upgrade

........
  r64368 | trent.nelson | 2008-06-17 23:13:44 -0500 (Tue, 17 Jun 2008) | 1 line

  Initial commit of work pertaining to switching the Windows build from Berkeley DB 4.4.20 to 4.7.25.  Note that I've deprecated the standalone '_bsddb44.vcproj' in lieu of adding the sources in a separate folder to the _bsddb project.  This was a conscious decision and actually makes everything far more easier to manage.  With this approach, entire test suite passed straight off the bat.  Well, almost -- the timeout in bsddb/test/test_replication.py needed bumping up a little -- 2 seconds was too short.  10 seconds seems to be fine for me, but I'll make sure Jesus verifies.  More documentation to come once I've been able to test out this approach on the buildbots (hence keeping the changes in a separate branch for now).
........
  r64369 | trent.nelson | 2008-06-17 23:19:12 -0500 (Tue, 17 Jun 2008) | 1 line

  Bump Berkeley DB version from 4.4.20 to 4.7.25.
........
2008-06-27 02:30:34 +00:00
Amaury Forgeot d'Arc d574633894 Typo in a directory name. Should help the AMD64 buildbots 2008-06-18 21:33:58 +00:00
Martin v. Löwis 945c632dff Set eol-style to CRLF for all batch files. 2008-06-14 11:51:54 +00:00
Martin v. Löwis 6807120c64 Avoid rebuilding tcl/tk.
Merge x86 changes into AMD64.
2008-06-14 11:50:59 +00:00
Amaury Forgeot d'Arc 8c3bc862fa Since python2.6 must run on Windows 2000,
explicitely disable the use of Windows XP themes when compiling tk.
This is also consistent with the WINVER=0x0500 option.
2008-06-14 09:44:41 +00:00
Amaury Forgeot d'Arc c06f5a45c3 Use the correct URL for sqlite3 sources, and try to fix windows buildbots. 2008-06-14 07:40:32 +00:00
Martin v. Löwis cc0f2b20c5 Switch to SQLite 3.5.9. 2008-06-13 18:12:51 +00:00
Martin v. Löwis a4514c3009 Switch to bzip2 1.0.5. 2008-06-13 17:22:39 +00:00
Martin v. Löwis 329d738380 Split Tcl make targets into separate ones. 2008-06-12 19:51:59 +00:00
Martin v. Löwis 7630731af0 Switch to Tcl/Tk 8.5. 2008-06-12 18:52:00 +00:00
Martin v. Löwis a38379649b Explicitly refer to current hhp file (2.6a3) 2008-05-10 13:24:09 +00:00
Trent Nelson 5a4d66824a Don't run kill_python as part of the build process. Change the buildbots so they have to call it explicitly instead. 2008-04-06 20:51:23 +00:00
Trent Nelson d6dffbcc28 Reimplement kill_python. The existing version had a number of flaws, namely, it didn't work for x64 and it wasn't precise about which python_d.exe it was killing -- it just killed the first one it came across that happened to have 'pcbuild\python_d.exe' or 'build\python_d.exe' in it's path. The new version has been rewritten from the ground up and now lives in PCbuild, instead of Tools\buildbot, and it has also been incorporated into the Visual Studio solution (pcbuild.sln) as 'kill_python'. The solution has also been altered such that kill_python is called where necessary in the build process in order to prevent any linking errors due to open file locks. In lieu of this, all of the existing bits and pieces in Tools\buildbot that called out to kill_python at various points have also been removed as they are now obsolete. Tested on both Win32 and x64.
Change set (included to improve usefulness of svnmerge log entry):
M      PCbuild\pythoncore.vcproj
M      PCbuild\pcbuild.sln
M      PCbuild\release.vsprops
A      PCbuild\kill_python.vcproj
M      PCbuild\debug.vsprops
A      PCbuild\kill_python.c
D      Tools\buildbot\kill_python.bat
D      Tools\buildbot\kill_python.mak
M      Tools\buildbot\build.bat
D      Tools\buildbot\Makefile
M      Tools\buildbot\build-amd64.bat
M      Tools\buildbot\buildmsi.bat
D      Tools\buildbot\kill_python.c
2008-04-03 18:27:06 +00:00
Trent Nelson 980c598936 Remove the building of Berkeley DB step; _bsddb44.vcproj takes care of this for us now. 2008-04-03 15:39:17 +00:00
Trent Nelson 27f60a65e8 Comment out tcltk/tcltk64 removal. 2008-03-19 22:41:10 +00:00
Trent Nelson e7abf20ce7 Force a clean of the tcltk/tcltk64 directories now that we've completely changed the tcl/tk build environment. 2008-03-19 21:51:16 +00:00
Trent Nelson 611c86b7d1 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.
2008-03-19 21:11:55 +00:00
Thomas Heller 12b580b2c6 Checkout sqlite-source when it is not there. 2008-03-19 16:10:57 +00:00
Trent Nelson 4f4738f015 Lets have another try at getting the Windows buildbots in a consistent state before rebuilding using the new process. 2008-03-19 09:23:08 +00:00
Trent Nelson 4fbaacaa12 Fix the tcl-8.4.18.1 path and make sure we cd into the right directory when building tcl/tk. 2008-03-19 08:06:03 +00:00
Trent Nelson 05a96641b4 Refine the Visual Studio 2008 build solution in order to improve how we deal with external components, as well as fixing outstanding issues with Windows x64 build support. Introduce two new .vcproj files, _bsddb44.vcproj and sqlite3.vcproj, which replace the previous pre-link event scripts for _bsddb and _sqlite3 respectively. The new project files inherit from our property files as if they were any other Python module. This has numerous benefits. First, the components get built with exactly the same compiler flags and settings as the rest of Python. Second, it makes it much easier to debug problems in the external components when they're part of the build system. Third, they'll benefit from profile guided optimisation in the release builds, just like the rest of Python core.
I've also introduced a slightly new pattern for managing externals in subversion.  New components get checked in as <name>-<version>.x, where <version> matches the exact vendor version string.  After the initial import of the external component, the .x is tagged as .0 (i.e. tcl-8.4.18.x -> tcl-8.4.18.0).  Some components may not need any tweaking, whereas there are others that might (tcl/tk fall into this bucket).  In that case, the relevant modifications are made to the .x branch, which will be subsequently tagged as .1 (and then n+1 going forward) when they build successfully and all tests pass.  Buildbots will be converted to rely on these explicit tags only, which makes it easy for us to switch them over to a new version as and when required.  (Simple change to external(-amd64).bat: if we've bumped tcl to 8.4.18.1, change the .bat to rmdir 8.4.18.0 if it exists and check out a new .1 copy.)
2008-03-19 07:45:19 +00:00
Martin v. Löwis f2b333a0c9 Run debug version, cd to PCbuild. 2008-03-14 21:19:28 +00:00
Martin v. Löwis 7bae4432a3 Use -x64 flag. 2008-03-14 13:57:59 +00:00
Martin v. Löwis db311ba588 Update db-4.4.20 build procedure. 2008-03-06 13:50:28 +00:00
Martin v. Löwis 4291b19d4e cd PCbuild only after deleting all pyc files. 2008-03-05 22:24:31 +00:00
Martin v. Löwis 8b6552deb3 Build db-4.4.20 with VS9; remove VS2003 build if necessary. 2008-02-29 18:17:23 +00:00
Thomas Heller 61390fd884 Change amd64 buildbot scripts to use Visual Studio 2008, and
to use the required versions of external sources.
External sources are not yet built, so the build-step fails to
built some targets.
2008-01-09 21:35:43 +00:00
Thomas Heller f71b59b072 Change amd64 buildbot scripts to use Visual Studio 2008, and
to use the required versions of external sources.
External sources are not yet built, so the build-step fails to
built some targets.
2008-01-09 21:35:04 +00:00
Martin v. Löwis 4b3311b25b Use vcbuild for VS 2009. 2008-01-06 10:09:48 +00:00
Martin v. Löwis 9fd2bcf654 Test in PCbuild directory. 2008-01-01 23:36:24 +00:00
Martin v. Löwis 76f1c1f304 Use Visual Studio 2009 on the build slaves. 2008-01-01 23:00:48 +00:00
Christian Heimes 656dc2adee Fix paths for build bot 2007-12-31 14:59:26 +00:00
Martin v. Löwis f0a5b09db2 Clean both Release and Debug projects, to support
the MSI builder.
2007-09-14 06:49:43 +00:00
Martin v. Löwis 0dda1e9e94 More path fixes. 2007-09-13 13:27:27 +00:00
Martin v. Löwis 4bd037df5d Fix path. 2007-09-13 10:38:42 +00:00
Martin v. Löwis 82151c67a4 Add more automated actions. 2007-09-13 09:59:00 +00:00
Martin v. Löwis 342cff6d55 Require that bash.exe is on the path, along with the rest of Cygwin. 2007-09-10 13:30:38 +00:00
Martin v. Löwis 42cdada8ce Update before making htmlhelp. 2007-09-10 13:20:03 +00:00
Martin v. Löwis fbf83bbd77 Beginnings of a "build MSI" step. 2007-09-10 10:22:05 +00:00
Thomas Heller 22000cbd6b Build bzip2. 2007-06-13 07:54:57 +00:00
Thomas Heller 635d7a224a Notes about building tcl/tk for windows/AMD64. 2007-06-13 07:07:41 +00:00
Thomas Heller 92094d0f1c Do not hardcode the buildbot's directory name. 2007-06-13 07:07:03 +00:00