Commit Graph

1813 Commits

Author SHA1 Message Date
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
Benjamin Peterson b8bfdf5200 fix Tools/scripts/2to3 as the result of a merge error 2008-06-16 20:18:18 +00:00
Martin v. Löwis fd82f2e86a Disable UAC by default. 2008-06-14 14:24:47 +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 a6e02e8406 Conservatively restrict support to format 8 repositories. 2008-06-14 06:24:44 +00:00
Martin v. Löwis 49ac5aa2ef Support subversion repositories of version 8. 2008-06-14 01:50:46 +00:00
Martin v. Löwis c9798fc709 Pickup sqlite3.dll from binary directory.
Commit more often.
2008-06-13 18:58:47 +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 111c180674 Make more symbols static. 2008-06-13 07:47:47 +00:00
Martin v. Löwis b8a18eaca9 Fix Tcl/Tk license file in tcl8*/tk8*, include Tix license. 2008-06-12 20:07:53 +00:00
Martin v. Löwis 7b9e124776 Support file names which include '+' (for Tk 8.5). 2008-06-12 20:06:18 +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
Georg Brandl 0b9aaa98a0 Spaces vs. tabs. 2008-06-01 19:24:36 +00:00
Benjamin Peterson c49372b080 add a warning about bgen being removed 2008-06-01 19:01:25 +00:00
Martin v. Löwis 367c79a4ad Create grammar pickle files on installation; remove them on uninstallation. 2008-05-25 16:37:34 +00:00
Martin v. Löwis dcc86204eb Include all licenses of the packages that we include. 2008-05-25 11:56:23 +00:00
Georg Brandl a6168f9e0a Queue renaming reversal part 3: move module into place and
change imports and other references. Closes #2925.
2008-05-25 07:20:14 +00:00
Georg Brandl 6634bf2919 Tkinter rename reversal: remove tkinter package, adapt imports and docs. 2008-05-20 07:13:37 +00:00
Georg Brandl 6c90c9faae Add new tkinter dir to various locations where lib-tk shows up. 2008-05-17 19:14:23 +00:00
Alexandre Vassalotti 30ece44f2e Added stub for the Queue module to be renamed in 3.0.
Use the 3.0 module name to avoid spurious warnings.
2008-05-11 19:39:48 +00:00
Martin v. Löwis a38379649b Explicitly refer to current hhp file (2.6a3) 2008-05-10 13:24:09 +00:00
Martin v. Löwis f466c2a247 Port to VS 2008. Drop W9x support. 2008-05-09 20:11:37 +00:00
Martin v. Löwis 344d066a43 Use the CHM file name that Sphinx assigns. 2008-05-09 18:21:55 +00:00
Martin v. Löwis 8bd5334a9e Add 2.6b1 and 2.6b2 UUIDs. 2008-05-09 17:11:07 +00:00
Gregory P. Smith fa1814e1b6 explicitly flush after the ... since there wasn't a newline 2008-04-21 17:46:40 +00:00
Thomas Heller b9dd8db8bf Fix typo. 2008-04-21 13:46:55 +00:00
Martin v. Löwis 023b9f952a Package wininst*.exe from distutils/command. 2008-04-09 18:56:20 +00:00
Martin v. Löwis 775e10d9e6 Suppress compilation of py3_ files upon installation. 2008-04-08 16:48:35 +00:00
Martin v. Löwis 1e72feced3 Make the "private CRT" case work, by editing the
manifest in DLLs to refer to the root copy of the CRT.
2008-04-07 16:34:04 +00:00
Martin v. Löwis 46a8be7a35 Drop support for 7.1 CRT. 2008-04-07 14:55:53 +00:00
Martin v. Löwis e411f8955f Make private_crt feature object a global variable. 2008-04-07 14:54:16 +00:00
Martin v. Löwis 54d489a97f Delete ALLUSERS property merged from CRT merge module, so that per-user installations become possible again. 2008-04-07 14:53:34 +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
Martin v. Löwis db508be07e Add script to merge msvcr90. 2008-04-05 15:50:58 +00:00
Martin v. Löwis 4dc3415def Add two features to distinguish between private and SxS CRT. 2008-04-05 15:48:36 +00:00
Martin v. Löwis 5f187fba31 Extend sizes of various fields, to support the CRT90 merge module. 2008-04-05 15:45:25 +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
Benjamin Peterson 5b63acd31e #2503 make singletons compared with "is" not == or !=
Thanks to Wummel for the patch
2008-03-29 15:24:25 +00:00
Martin v. Löwis cdbc977c03 Install 2to3 script. 2008-03-24 12:57:53 +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
Brett Cannon a8b09fd4c3 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
some verification:

- Runs reindent.py on all .py files.
- Checks if any changes in Doc exist.
- Whether Misc/ACKS was changed.
- Whether Misc/NEWS was changed.

The hope is that ``make check`` can become a command anybody can run to get
reminders about what all the requisite steps needed to create a proper
patch/checkin.
2008-03-18 17:25:13 +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
Jeffrey Yasskin 3accbb0729 Well that was dumb. platform.python_implementation returns a function, not a
string.
2008-03-08 21:35:15 +00:00
Jeffrey Yasskin 019e9d730a Fix pybench for pythons < 2.6, tested back to 2.3. 2008-03-08 20:08:21 +00:00
Jeffrey Yasskin 0df0f6d1b2 Add tests for with and finally performance to pybench. 2008-03-08 18:26:54 +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 0e795e7d92 Package Tcl from tcltk64 on AMD64. 2008-02-29 20:54:44 +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
Martin v. Löwis 03dc56cd17 Locate VS installation dir from environment, so that it works with the express edition. 2008-02-28 22:20:50 +00:00
Martin v. Löwis d9759c4880 Bundle msvcr90.dll as a "private assembly". 2008-02-28 19:57:34 +00:00
Martin v. Löwis 1c5105d668 Add 2.6aN uuids. 2008-02-28 19:44:22 +00:00
Facundo Batista 4219da4bd0 Issue 2117. Update compiler module to handle class decorators.
Thanks Thomas Herve
2008-02-25 18:06:00 +00:00
Christian Heimes c5f05e45cf Patch #2167 from calvin: Remove unused imports 2008-02-23 17:40:11 +00:00
Facundo Batista f88a077f69 Now we handle different the backup copy, because of security
issues regarding user/group and permissions. Fixes 1050828.
2008-02-17 16:21:13 +00:00
Georg Brandl 1ea8cb49ed #1726198: replace while 1: fp.readline() with file iteration. 2008-01-21 17:22:06 +00:00
Christian Heimes bd865db90c Added win_add2path.py to Tools/scripts/
Added builddoc.bat to Doc/
2008-01-18 11:58:50 +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 94da1d6a21 Don't try to package msvcr90 for the moment. 2008-01-06 11:13:16 +00:00
Martin v. Löwis e7a434e41b Package using VS 2008. 2008-01-06 11:03:43 +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 e1c6af06ec The root of the project is two levels up from PC/VS7.1 2008-01-01 13:58:16 +00:00
Christian Heimes 7e28e495a4 Added new wininst files to msi.py and adjusted some paths 2008-01-01 13:52:57 +00:00
Christian Heimes e604eb9a35 MSI uses back slashes as path separators 2008-01-01 13:40:26 +00:00
Christian Heimes ce49f02063 Fix paths for build bot, part 2 2007-12-31 15:02:41 +00:00
Christian Heimes 656dc2adee Fix paths for build bot 2007-12-31 14:59:26 +00:00
Christian Heimes 19b1aaa45d Added VS 2005 and VS 2008 to the search path for cabarc.exe 2007-12-04 15:52:14 +00:00
Christian Heimes 9acba0441e Added self generated UUID for msvcr90.dll to msi.py
Readded a missing line.
2007-12-04 14:57:30 +00:00
Martin v. Löwis 6b449f4f2b Issue #1727780: Support loading pickles of random.Random objects created
on 32-bit systems on 64-bit systems, and vice versa. As a consequence
of the change, Random pickles created by Python 2.6 cannot be loaded
in Python 2.5.
2007-12-03 19:20:02 +00:00
Martin v. Löwis 0ffdacd53b Patch #1468: Package Lib/test/*.pem. 2007-11-20 02:46:02 +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
Martin v. Löwis 8628f7509f Take chm file from build/htmlhelp/pydoc.chm. 2007-09-10 10:21:22 +00:00
Martin v. Löwis 8bc77e4b33 Bug #1737210: Change Manufacturer of Windows installer to PSF.
Will backport to 2.5.
2007-09-01 06:36:03 +00:00
Martin v. Löwis 1ab4a1f9b8 Mark registry components as 64-bit on Win64. 2007-08-31 10:01:07 +00:00
Martin v. Löwis 75c23bddbe Bug #1746880: Correctly install DLLs into system32 folder on Win64. 2007-08-30 18:25:47 +00:00
Martin v. Löwis 5409c8d84d Fix typo. 2007-08-30 18:15:22 +00:00
Martin v. Löwis e89cd17dfa Fix popen usage. 2007-08-30 18:14:01 +00:00