Commit Graph

783 Commits

Author SHA1 Message Date
Charles-François Natali 6315ffa339 Merge. 2014-06-20 22:41:21 +01:00
Zachary Ware a4d1e461a7 Merge with 3.4 2014-06-13 09:43:32 -05:00
Zachary Ware ee0e5104b8 Per Martin [1], PGO is no longer used for official releases.
[1] https://mail.python.org/pipermail/python-dev/2014-June/135018.html
2014-06-13 09:43:15 -05:00
Zachary Ware ff7cfb21d9 Issue #21745: Merge with 3.4 2014-06-13 09:39:24 -05:00
Zachary Ware 4856a6ae7d Issue #21745: Mention VS2010 SP1 as a solution for LNK1123 errors 2014-06-13 09:38:50 -05:00
Zachary Ware 3266a8fa59 Issue #21671: Merge with 3.4 2014-06-06 01:27:34 -05:00
Zachary Ware 7d55da42a4 Issue #21671, CVE-2014-0224: Update the Windows build to openssl-1.0.1h 2014-06-06 01:23:53 -05:00
Zachary Ware ba9d233d83 Issue #21665: Don't use 'OPTS=noxp' when compiling Tk.
That option had been for Win2k compatibility (which was dropped with
Python 3.3) and makes default ttk ugly on post-Win2k systems.
2014-06-05 11:53:44 -05:00
Zachary Ware 90441e857d Issue #21623: open pyproject.props with an explicit encoding 2014-06-02 12:09:13 -05:00
Tim Golden 4b8dd71d0a Issue21452 Add missing backslash to build path for make_buildinfo 2014-05-09 18:19:31 +01:00
Tim Golden 877013fe14 Merge 2014-05-09 18:19:13 +01:00
Tim Golden 55c2364561 Issue21452 Add missing backslash to build path for make_buildinfo 2014-05-09 18:18:11 +01:00
Tim Golden faf4d9ca8b Issue10752 Be more robust when finding a PERL interpreter to build OpenSSL. Initial patch by Gabi Davar 2014-05-09 18:01:44 +01:00
Tim Golden 9c18fcf161 Issue10752 Be more robust when finding a PERL interpreter to build OpenSSL. Initial patch by Gabi Davar 2014-05-09 18:01:19 +01:00
Zachary Ware 10c2dba8b2 Issue #21141: The Windows build process no longer attempts to find Perl,
instead relying on OpenSSL source being configured and ready to build.  The
``PCbuild\build_ssl.py`` script has been re-written and re-named to
``PCbuild\prepare_ssl.py``, and takes care of configuring OpenSSL source
for both 32 and 64 bit platforms.  OpenSSL sources obtained from
svn.python.org will always be pre-configured and ready to build.
2014-05-09 09:07:50 -05:00
Martin v. Löwis b9e71d4a55 Merge with 3.4 2014-05-01 15:18:43 +02:00
Martin v. Löwis 3d5c9e2c67 Update to 1.0.1g 2014-05-01 14:28:48 +02:00
Zachary Ware 45bc17b6b4 Issue #19962: The Windows build process now creates "python.bat"
in the root of the source tree, which passes all arguments through
to the most recently built interpreter.
2014-04-30 15:47:53 -05:00
Zachary Ware 404b5dac85 "Escape" a character in the middle of "warning"
This should stop Buildbot from falsely reporting a warning on Windows bots.
2014-04-23 12:09:54 -05:00
Zachary Ware 1626993f38 "Escape" a character in the middle of "warning"
This should stop Buildbot from falsely reporting a warning on Windows bots.
2014-04-23 12:09:54 -05:00
Zachary Ware 4b87dc6e83 Add tcltk.props to "Visual Studio properties" section of PCbuild/readme.txt. 2014-03-28 23:36:43 -05:00
Zachary Ware 808676b432 Merge with 3.4 2014-03-28 23:31:53 -05:00
Zachary Ware e08f376ed2 Fix another old mention of "Standard Edition" VS in PCbuild/readme.txt.
Also removes a mention of using "Express Edition with the Windows SDK
64-bit compilers" to build 64-bit Python.  If that can be made to work,
it will need some extra instructions somewhere.
2014-03-28 23:31:04 -05:00
Zachary Ware 92497a42b7 Issue #21017: Enable Tix debug build on Windows 2014-03-22 10:37:06 -05:00
Zachary Ware 4bcf5a52ae Issue #15968: Temporarily revert change to PCbuild/rt.bat
to prevent buildbot failures on test_idle.  This change
should go back in once #20035 is fixed.
2014-03-22 00:36:25 -05:00
Zachary Ware a191b91a43 Issue #15968: Incorporated Tcl, Tk, and Tix builds into the Windows build
solution.

Currently, Tix is not built in Debug configuration.

This change also:
- simplifies some Tcl/Tk-related msbuild properties for _tkinter
- copies the Tcl and Tk DLLs into the build output directory, meaning
  they will always be available after a build without having to copy
  them manually or change PATH
- removes PCbuild/build_tkinter.py: the solution does the build without
  needing to invoke Python (so Tcl/Tk/Tix can be built in parallel with
  the rest of the build using the `/m` msbuild command line switch)
- removes an outdated README concerning building Tcl/Tk on AMD64
2014-03-21 22:58:19 -05:00
Zachary Ware 26e417b182 Merge with 3.4 2014-03-19 14:47:49 -05:00
Zachary Ware 5f3e3c3429 Use the correct VS edition names in PCbuild/readme.txt 2014-03-19 14:46:25 -05:00
Zachary Ware 4278b2d782 Merge xxlimited compile warning fix from 3.4 2014-03-18 23:09:00 -05:00
Zachary Ware 232b017607 Avoid compile warning in xxlimited on 32-bit Windows non-Debug builds. 2014-03-18 23:05:01 -05:00
Zachary Ware 0e5e4a4085 Merge PCbuild/pcbuild.sln cleanup from 3.4 2014-03-18 22:40:23 -05:00
Zachary Ware 270e7377ce Clean up PCbuild/pcbuild.sln a bit:
- Remove configuration settings from removed _sha3.vcxproj
- Don't try to build configurations of _testembed that don't exist
  (namely, PGInstrument and PGUpdate)
2014-03-18 22:34:52 -05:00
Zachary Ware 6373ba5199 Bump Windows build to 3.5 2014-03-17 15:57:38 -05:00
Zachary Ware 5ccca9516a Make pywlauncher.vcxproj depend on make_versioninfo.vcxproj.
pylauncher.vcxproj already has the same dependency, and adding it to
the pywlauncher project eliminates the possibility of the pywlauncher
build failing when building the solution in parallel.  In particular,
pywlauncher may fail to build when doing a "Rebuild Solution" from the
VS Build menu.

Merge with 3.3.
2014-03-06 13:28:08 -06:00
Zachary Ware 54d04a46f3 Make pywlauncher.vcxproj depend on make_versioninfo.vcxproj.
pylauncher.vcxproj already has the same dependency, and adding it to
the pywlauncher project eliminates the possibility of the pywlauncher
build failing when building the solution in parallel.  In particular,
pywlauncher may fail to build when doing a "Rebuild Solution" from the
VS Build menu.
2014-03-06 13:21:45 -06:00
Martin v. Löwis 09257f7ced Issue #20465: Update Windows installer to SQLite 3.8.3.1. 2014-03-02 19:42:50 +01:00
Zachary Ware b59e4425d5 Issue #20609: Merge with 3.3. 2014-02-18 11:35:15 -06:00
Zachary Ware 9e5a9876ad Issue #20609: Fix building 64-bit binaries on 32-bit Windows. 2014-02-18 11:33:18 -06:00
Martin v. Löwis 5aaf8476fd Drop reference to pythoncore, to avoid linking python34.dll 2014-01-04 11:25:35 +01:00
Martin v. Löwis 7341b524af Revert accidental deletion of _overlapped. 2014-01-03 15:53:20 +01:00
Martin v. Löwis 24e43308b7 * Issue #16113: Remove sha3 module again.
Patch by Christian Heimes, with modifications.
2014-01-03 14:05:06 +01:00
Zachary Ware f06247d16a Properly filter some recent additions in the Windows build files. 2013-12-11 17:21:13 -06:00
Zachary Ware bdbffd0342 Filter namespaceobject's files properly in the pythoncore VS project. 2013-12-11 17:12:34 -06:00
Zachary Ware 14fff88773 Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the
pythoncore sub-project.  This should prevent build errors due a previous
build's python(_d).exe still running.
2013-11-26 16:34:45 -06:00
Zachary Ware bb65b5bf1d Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the
pythoncore sub-project.  This should prevent build errors due a previous
build's python(_d).exe still running.
2013-11-26 16:32:59 -06:00
Christian Heimes 71135ac72d Add _opcode to Windows build env 2013-11-24 01:11:57 +01:00
Martin v. Löwis 8d0d369067 Update Tcl/Tk to 8.6.1. 2013-11-23 23:05:27 +01:00
Victor Stinner ed3b0bca3e Issue #18874: Implement the PEP 454 (tracemalloc) 2013-11-23 12:27:24 +01:00
Martin v. Löwis baacf4d293 Update xz to 5.0.5. 2013-11-22 19:13:51 +01:00
Martin v. Löwis bc2f0ba6b8 Update SQLite to 3.8.1 on Windows. 2013-11-22 18:36:28 +01:00