Commit Graph

605 Commits

Author SHA1 Message Date
Martin v. Löwis cac8f585b1 Update AMD64 build for amalgamated sqlite. 2008-06-13 18:19:49 +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
Amaury Forgeot d'Arc 6fd3321d6c Update VS8.0 build files, using the script vs9to8.py.
Also remove references to odbc libraries, which are not shipped with vs2003 express.
(and certainly not useful)
2008-06-12 21:58:20 +00:00
Amaury Forgeot d'Arc 3511388315 It seems that my VS2008 Express does not include a project in the build configuration,
if its UUID has lowercase letters.
2008-06-12 20:27:42 +00:00
Martin v. Löwis a41be1d1d2 Revert bogus disabling of Tcl and Tk. 2008-06-12 19:00:14 +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 db2c9f48c5 Switch to Tcl/Tk 8.5.2. 2008-06-12 18:38:47 +00:00
Benjamin Peterson 32c2e41c82 fix Windows building for multiprocessing 2008-06-11 16:50:57 +00:00
Gregory P. Smith b7fea62cca Rename bytesobject.c back to stringobject.c to keep with the PyString theme.
Part of reverting most of r63675 per the mailing list discussion.
2008-06-10 21:23:22 +00:00
Christian Heimes 44720838eb Renamed bytesobject.c to bytearrayobject.c
Renamed stringobject.c to bytesobject.c
Fixed Windows builds
2008-05-26 13:01:01 +00:00
Trent Nelson 5f5434074a Introduce a user macro named $(externalsDir), which should point to the root directory of where all the external sources should live. Developers can change this value if their external sources live elsewhere. The default of '..\..' matches the current status quo. 2008-05-23 20:33:14 +00:00
Alexandre Vassalotti 1aed624f7c Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
2008-05-09 21:49:43 +00:00
Christian Heimes 5be01769aa Re-added getbuildinfo.c solution item 2008-05-06 23:59:53 +00:00
Brett Cannon 4b964f9c90 Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob
Ippolito.

Closes issue #2750.
2008-05-05 20:21:38 +00:00
Christian Heimes 81ad6a185a Added new files to Windows project files
More Windows related fixes are coming soon
2008-04-18 23:40:40 +00:00
Amaury Forgeot d'Arc 14d6b0f8f0 Update project files for all Windows supported compilers 2008-04-14 19:55:40 +00:00
Christian Heimes a2d7f4c7a3 Added new files to the pcbuild files 2008-04-13 09:37:05 +00:00
Amaury Forgeot d'Arc 7adc776ea6 Issue 2408: remove the _types module
It was only used as a helper in types.py to access types (GetSetDescriptorType and MemberDescriptorType),
when they can easily be obtained with python code.
These expressions even work with Jython.

I don't know what the future of the types module is; (cf. discussion in http://bugs.python.org/issue1605 )
at least this change makes it simpler.
2008-04-08 22:07:05 +00:00
Mark Hammond 495cf99aaf Issue #2513: enable 64bit cross compilation on windows. 2008-04-07 01:53:39 +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 2aae1d92eb Make kill_python a little more forgiving if it can't obtain a snapshot of module information for a given python[_d].exe process. Failing here was too pessimistic; the python[_d].exe process may be owned by another user, which is the case in some buildbot environments. 2008-04-03 20:00:08 +00:00
Trent Nelson 8d69c1f95f Add the correct OutputFile values for debug builds. Fixes r62129's commit. 2008-04-03 18:48:53 +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 dbc114af0a Update information pertaining to building external components, as well as notes on x64 builds. This file now accurately describes the build process as is; however, there's still a lot of room for improvement, especially with regards to how we build Tcl/Tk, Tix, and OpenSSL. Watch this space for further improvements. 2008-04-02 15:01:00 +00:00
Christian Heimes a82e8db5e4 Hopefully added _fileio module to the Windows build system 2008-03-27 01:36:21 +00:00
Christian Heimes 1a6387e683 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray

........
  r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line

  Copied files from py3k w/o modifications
........
  r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines

  Take One
  * Added initialization code, warnings, flags etc. to the appropriate places
  * Added new buffer interface to string type
  * Modified tests
  * Modified Makefile.pre.in to compile the new files
  * Added bytesobject.c to Python.h
........
  r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines

  Disabled bytearray.extend for now since it causes an infinite recursion
  Fixed serveral unit tests
........
  r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines

  Added PyBytes support to several places:
  str + bytearray
  ord(bytearray)
  bytearray(str, encoding)
........
  r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line

  Fixed more unit tests related to type('') is not unicode
........
  r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines

  Fixed more unit tests
  Fixed bytearray.extend
........
  r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line

  Implemented old buffer interface for bytearray
........
  r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line

  Added backport of the io module
........
  r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line

  Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
  r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines

  Fixed more tests
  Fixed bytearray() comparsion with unicode()
  Fixed iterator assignment of bytearray
........
  r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines

  str(bytesarray()) now returns the bytes and not the representation of the bytearray object
  Enabled and fixed more unit tests
........
  r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines

  Clear error PyNumber_AsSsize_t() fails
  Use CHARMASK for ob_svall access
  disabled a test with memoryview again
........
  r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line

  Untested updates to the PCBuild directory
........
  r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line

  The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
  r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines

  Disabled last failing test
  I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
  r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line

  Re-enabled bytes warning code
........
  r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line

  Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
  r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line

  Re-enabled bytearray subclassing - all tests are passing.
........
2008-03-26 12:49:49 +00:00
Trent Nelson 2b1ec17ceb Remove extraneous apostrophe and semi-colon from AdditionalIncludeDirectories. 2008-03-19 07:56:39 +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
Trent Nelson 3ce76756d3 Issue 2286: bump up the stack size of the 64-bit debug python_d.exe to 2100000. The default value of 200000 causes a stack overflow at 1965 iterations of r_object() in marshal.c, 35 iterations before the 2000 limit enforced by MAX_MARSHAL_STACK_DEPTH. 2008-03-18 07:02:12 +00:00
Martin v. Löwis bf7b0b7b81 Patch #2284: add -x64 option to rt.bat. 2008-03-14 13:56:09 +00:00
Martin v. Löwis 8c4e799ad0 Rely on x64 platform configuration when building _bsddb on AMD64. 2008-03-06 13:49:47 +00:00
Martin v. Löwis d9153fdc29 Make _hashlib depend on pythoncore. 2008-02-29 20:26:53 +00:00
Martin v. Löwis 9e0513591d Port build_ssl.py to 2.4; support HOST_PYTHON variable 2008-02-29 18:54:45 +00:00
Martin v. Löwis f06858d154 Make _hashlib a separate project. 2008-02-29 16:59:21 +00:00
Christian Heimes c5f05e45cf Patch #2167 from calvin: Remove unused imports 2008-02-23 17:40:11 +00:00
Eric Smith a73fbe791d Added future_builtins, which contains PEP 3127 compatible versions of hex() and oct(). 2008-02-23 03:09:44 +00:00
Amaury Forgeot d'Arc e7fa408741 Compilation was broken on Windows since the introduction of Advanced String Formatting.
Only PCBuild (vs9) was really tested.
Changes for older compilers were done manually.
2008-02-17 20:56:31 +00:00
Christian Heimes 95d644708e Issue #1706: Require Windows 2000+
Added Py_BUILD_CORE_MODULES macro to set WINVER and NTDDI_VERSION to Windows 2000 for core modules, too
Added -d option to build.bat (same as -c Debug) and fixed warning about /build option
Updated Windows related readme.txt files
2008-02-09 19:55:22 +00:00
Christian Heimes 3af3ecca92 Fixed paths to Windows build directories in build_ext.py
Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
2008-02-03 14:34:18 +00:00
Thomas Heller eb65c99d00 Revert revision 59913, because it was wrong:
The sqlite3 dll, when compiled in debug mode, must be linked with
  /MDd to use the debug runtime library.  Further, the dll will be
  named sqlite3_d.dll.
2008-01-11 15:38:46 +00:00
Thomas Heller 348fd45ec4 The sqlite3 dll, when compiled in debug mode, must be linked with /MDd
to use the debug runtime library.  Further, the dll will be named
sqlite3_d.dll.
2008-01-11 12:41:39 +00:00
Thomas Heller d17315f1c2 Add an important missing blank. 2008-01-11 08:04:03 +00:00
Thomas Heller 44c38c16b8 Reflow a paragraph, and fix a typo. 2008-01-10 18:45:40 +00:00
Thomas Heller 3247aa9078 Set the output file in the _ctypes Debug|x64 configuration. 2008-01-09 11:19:19 +00:00
Christian Heimes 3001c5463e Final adjustments for #1601 2008-01-05 21:35:52 +00:00
Christian Heimes 1beea3be3e Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj 2008-01-03 15:41:30 +00:00
Christian Heimes fed3ebc000 Made vs9to8 Unix compatible 2008-01-02 18:28:32 +00:00
Christian Heimes d9fbab2621 Removed PCbuild8/ directory and added a new build directory for VS 2005
based on the VS 2008 build directory to PC/VS8.0. The script
PCbuild/vs8to9.py was added to sync changes from PCbuild to PC/VS8.0.

Kristjan, the initial creator of the PCbuild8 directory is fine with the replacement. I've moved the new version of the VS 2005 build directory next to the other legacy build directories. The new sync script is based on the work of wreck and syncs changes in the project, property and solution files.
2008-01-02 17:43:40 +00:00
Martin v. Löwis b31131c5bc Don't link with Tix; Tix is loaded dynamically by Tcl. 2008-01-01 23:00:00 +00:00
Christian Heimes 3adfe9aaae Renamed PCBuild9 directory to PCBuild 2007-12-31 15:18:55 +00:00
Christian Heimes 915d5d96d8 Moved PCbuild directory to PC/VS7.1 2007-12-31 14:51:18 +00:00
Christian Heimes 0a8143f646 Applied patch #1635: Float patch for inf and nan on Windows (and other platforms).
The patch unifies float("inf") and repr(float("inf")) on all platforms.
2007-12-18 23:22:54 +00:00
Christian Heimes f15c66e143 The new float repr causes too much trouble and pain. I'm disabling the feature until we have sorted out the issues on all machines. 64bit machines seem to have issues and Guido has reported even worse.
Guido: It's pretty bad actually -- repr(1e5) comes out as '1.0'... Ditto for
repr(1eN) for most N... Both in 2.6 and in 3.0...
2007-12-11 00:54:34 +00:00
Christian Heimes 284d927625 Backport of r59456:59458 from py3k to trunk
Issue #1580: New free format floating point representation based on "Floating-Point Printer Sample Code", by Robert G. Burger. For example repr(11./5) now returns '2.2' instead of '2.2000000000000002'.

Thanks to noam for the patch! I had to modify doubledigits.c slightly to support X64 and IA64 machines on Windows. I also added the new file to the three project files.
2007-12-10 22:28:56 +00:00
Martin v. Löwis fb57e7e23e Rename import library for debug build to _msi_d.lib. 2007-09-14 06:50:21 +00:00
Thomas Heller 285216ca30 Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
2007-06-12 19:02:59 +00:00
Thomas Heller 46950bae3e Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
2007-06-12 17:28:31 +00:00
Thomas Heller d34f9e9a54 Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
2007-06-12 16:23:19 +00:00
Thomas Heller c8720b9847 Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).

Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
2007-06-12 16:08:27 +00:00
Thomas Heller 20a6e1c966 Revert commit 55855. 2007-06-10 21:01:17 +00:00
Thomas Heller a7c583af6f For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
2007-06-10 17:55:51 +00:00
Thomas Heller ab8e279ba6 Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration. 2007-06-06 20:19:19 +00:00
Brett Cannon 7e93587746 Try to remove rgbimg from Windows builds. 2007-05-20 19:05:06 +00:00
Raymond Hettinger eb9798892d Prepare collections module for pure python code entries. 2007-02-28 18:37:52 +00:00
Martin v. Löwis cc0eba9d98 Merge 53501 and 53502 from 25 branch:
Add /GS- for AMD64 and Itanium builds where missing.
2007-01-20 14:05:39 +00:00
Anthony Baxter 83955ef639 update to (c) years to include 2007 2007-01-06 04:45:54 +00:00
Martin v. Löwis c9e82f6234 Patch #1576954: Update VC6 build directory; remove redundant
files in VC7. Will backport to 2.5.
2006-10-15 07:54:40 +00:00
Thomas Heller 7dc77ce969 Build _ctypes.pyd for win AMD64 into the MSVC project file.
Since MSVC doesn't know about .asm files, a helper batch file is needed
to find ml64.exe in predefined locations.  The helper script hardcodes
the path to the MS Platform SDK.
2006-08-25 09:26:33 +00:00
Neal Norwitz 3c9333970f Try to get the windows bots working again with the new peephole.c 2006-08-21 23:44:48 +00:00
Neal Norwitz 132bbb3d06 Try to get Windows bots working again. Take 2 2006-08-18 05:10:00 +00:00
Martin v. Löwis 59e9ac8ebe Merge 51340 and 51341 from 2.5 branch:
Leave tk build directory to restore original path.
Invoke debug mk1mf.pl after running Configure.
2006-08-17 19:19:32 +00:00
Martin v. Löwis 596fc9c384 Make cl build step compile-only (/c). Remove libs from source list. 2006-08-16 13:58:51 +00:00
Martin v. Löwis a09fd6efdd Build _hashlib on Windows. Build OpenSSL with masm assembler code.
Fixes #1535502.
2006-08-16 12:55:10 +00:00
Thomas Heller db7b443d8a Fix #1534738: win32 debug version of _msi must be _msi_d.pyd, not _msi.pyd.
Fix the name of the pdb file as well.
2006-08-04 19:49:31 +00:00
Barry Warsaw d17301f95c Enable the building of the _types module on Windows.
Note that this has only been tested for VS 2003 since that's all I have.
2006-07-27 23:50:40 +00:00
Martin v. Löwis c7990b5b98 Fix Debug build of _ssl. 2006-07-14 12:31:05 +00:00
Martin v. Löwis 1def4fafe2 Add debug output to analyse buildbot failure. 2006-07-14 12:10:09 +00:00
Martin v. Löwis d73168d954 Extend build_ssl to Win64, using VSExtComp. 2006-07-14 09:58:55 +00:00
Martin v. Löwis 1bf59597dd Patch #1509163: MS Toolkit Compiler no longer available 2006-06-29 18:58:44 +00:00
Nick Coghlan c649ec5b69 Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
2006-05-29 12:43:05 +00:00
Richard Jones 7b9558d37d Conversion of exceptions over from faked-up classes to new-style C types. 2006-05-27 12:29:24 +00:00
Tim Peters f178e5c1b7 Get the Windows build working again (recover from
`struct` module changes).
2006-05-23 19:34:37 +00:00
Martin v. Löwis f90347fdbb Patch 1490384: New Icons for the PC build. 2006-05-22 08:48:14 +00:00
Martin v. Löwis 79b0f85867 Use GS- and bufferoverlowU.lib where appropriate, for AMD64. 2006-04-26 17:19:44 +00:00
Gerhard Häring 3e99c0ad64 Updated the sqlite3 module to the external pysqlite 2.2.2 version. 2006-04-23 15:24:26 +00:00
Martin v. Löwis 07b3508e24 Upgrade to vsextcomp 0.8 (and thus the SDK for W2k3SP1) 2006-04-21 13:48:26 +00:00
Thomas Heller 112d4ec7d5 Fix typo. 2006-04-15 20:43:22 +00:00
Martin v. Löwis 48bbaf2375 Patch #1470875: Building Python with MS Free Compiler. 2006-04-15 18:06:54 +00:00
Thomas Heller 2f3f136b81 Allocate the 0x1D1A0000 base adress for the _ctypes extension module.
Export the COM entry point functions.

Note that there are several conflicting base addresses defined for
other extensions, also not all are listed in dllbase_nt.txt.
2006-04-13 08:33:58 +00:00
Martin v. Löwis 2f36caf8ff Define WIN32, to get proper struct alignment in WinSock2.h.
Fixes #1462352. Will backport.
2006-04-08 09:13:43 +00:00
Anthony Baxter 8e7b490890 upgrade to final version of pysqlite 2.2.0 2006-04-05 18:25:33 +00:00
Martin v. Löwis e510bd16ea Adjust sqlite3 build process to Win64. 2006-04-04 16:28:14 +00:00
Anthony Baxter cbb9f97299 update to correct version of pysqlite 2006-04-04 14:40:45 +00:00
Martin v. Löwis cecb885d62 Fix Debug, Itanium, AMD64 configurations 2006-04-04 12:34:06 +00:00
Martin v. Löwis 1a494bdf69 Add sqlite3 to the Windows build process. 2006-04-04 07:10:59 +00:00
Tim Peters 9161a0d8da Looks like someone renamed (or something) md5c.c to md5.c. 2006-04-03 19:54:07 +00:00
Martin v. Löwis f5af2aac38 Patch #1462700: Make _ctypes_test depend on _ctypes.
Use same GUID for pythoncore in project and solution.
2006-04-03 05:29:03 +00:00
Martin v. Löwis 0a4e98bf13 Allow supression of subwcrev.exe invocation on a per-working-copy basis. 2006-03-27 16:30:41 +00:00
Martin v. Löwis 9ca8789ee3 Update to Tk 8.4.12 and Tix 8.4.0 2006-03-21 13:20:29 +00:00