Commit Graph

905 Commits

Author SHA1 Message Date
Zachary Ware 27da359519 Merge with 3.5 2015-06-10 00:44:40 -05:00
Zachary Ware 785273cd84 Merge forward extras beyond #21907 backport. 2015-06-10 00:43:20 -05:00
Zachary Ware 6250df81bf Clean up/refactor the batch scripts used for building on Windows.
This is mostly a backport of issue #21907, but also includes a few
extras necessary to make the bulidbot scripts as thin as possible.
2015-06-09 23:16:52 -05:00
Steve Dower b980c05ef8 Issue #24376: Bumps xxlimited.vcxproj to use 3.6 limited ABI. 2015-06-03 11:05:57 -07:00
Steve Dower 405c7f0712 Issue #24376: xxlimited.c errors when building 32 and 64 bit on Windows 2015-06-03 11:04:44 -07:00
Steve Dower b6c6a4dc04 Issue #24376: xxlimited.c errors when building 32 and 64 bit on Windows 2015-06-03 11:03:15 -07:00
Eric Snow 97abf97e45 Merge from 3.5. 2015-05-30 14:56:30 -06:00
Eric Snow dce09c34a0 Issue #16991: Add odictobject.h on Windows. 2015-05-30 14:56:04 -06:00
Yury Selivanov 7aa5341164 Reverting my previous commit.
Something went horribly wrong when I was doing `hg rebase`.
2015-05-30 10:57:56 -04:00
Zachary Ware 41a6a625d4 Update Windows build for 3.6 2015-05-28 17:30:03 -05:00
Steve Dower 42a059b632 Issue #24268: Adds PCBuild project to build _testmultiphase module. 2015-05-23 17:51:54 -07:00
Zachary Ware 7dc9dea778 Issue #20035: Reimplement tkinter._fix module as a C function.
The new private C function makes no permanent changes to the environment
and is #ifdef'd out on non-Windows platforms.
2015-05-22 11:36:53 -05:00
Steve Dower f54bcfb835 Updates PCBuild.sln to open with VS 2015 by default. 2015-05-20 09:30:42 -07:00
Steve Dower c8241cfb8c Issue #24186: Disable optimised OpenSSL functions on 64-bit Windows to avoid crashing. 2015-05-13 21:44:02 -07:00
Gregory P. Smith 8cb6569fe1 Implements issue #9951: Adds a hex() method to bytes, bytearray, & memoryview.
Also updates a few internal implementations of the same thing to use the
new built-in code.

Contributed by Arnon Yaari.
2015-04-25 23:22:26 +00:00
Zachary Ware 9d04e6ab01 Update Tcl/Tk to 8.6.4.
The new version of Tcl/Tk plays nice(r) with VS2015 CTP 6+.
2015-04-14 11:53:03 -05:00
Zachary Ware bd4b247f17 Actually build Tix.
It's been absent from all alpha releases, which apparently nobody has noticed.
2015-04-14 10:58:06 -05:00
Zachary Ware 50ebf0316a Merge with 3.4 2015-04-13 12:30:53 -05:00
Zachary Ware 30cc6fae98 Force the Windows readme to CRLF 2015-04-13 12:28:11 -05:00
Zachary Ware 774ac377da Closes #17202: Merge with 3.4 2015-04-13 12:11:40 -05:00
Zachary Ware 4c9c848159 Issue #17202: Add .bat to .hgeol to force them to CRLF.
Using LF can a script to fail if it tries to use a label that is
split across 512 byte blocks.  Who knows why.
2015-04-13 11:59:54 -05:00
Zachary Ware 7dfa094e78 Closes #18402: Merge with 3.4 2015-04-13 10:53:11 -05:00
Zachary Ware a3655eaa39 Issue #18402: Also look for 64 bit Perl in build_ssl.py.
It's still not necessary to build, but may be useful to some.
2015-04-13 10:46:40 -05:00
Zachary Ware 057b530024 Put the NASM pulled from svn.python.org at the front of the PATH.
This will prevent failures from the version of NASM installed on buildbots,
if the ability to override the version used is desired again later, we can
figure out a way to opt in.
2015-04-09 20:16:05 -05:00
Zachary Ware 9f3109c459 Issue #23686: Update Windows build to use OpenSSL 1.0.2a. 2015-04-07 19:59:37 -05:00
Steve Dower c7d979f022 Closes #23686: Update Windows installer OpenSSL to 1.0.2a 2015-04-11 23:36:04 -04:00
Zachary Ware 6bd687e0f2 Merge with 3.4.
The fix has moved in this branch.  Also, the opt-in is already available
on this branch; just set nasmDir when building.
2015-04-09 20:20:55 -05:00
Zachary Ware a59f9639fa Fix prepare_ssl.py script
Builds using prepared sources that had Perl available anyway were broken
by the previous fix to this script (oops).
2015-04-09 15:48:32 -05:00
Zachary Ware f975b3d499 Fix prepare_ssl.py for OpenSSL 1.0.2a builds without Perl (using old system).
This change affects the makefiles checked into svn.python.org, which the 3.5
build no longer uses.  3.4 and 2.7 both still use those makefiles, but their
build_ssl.py scripts don't require an update; if the script is running the
'fix_makefiles' method it already has Perl available anyway.
2015-04-07 20:38:53 -05:00
Steve Dower d81431f587 Issue #23524: Replace _PyVerify_fd function with calling _set_thread_local_invalid_parameter_handler on every thread. 2015-03-06 14:47:02 -08:00
Steve Dower f63dab5a84 Back-out wcstok deprecation suppression and updates calls to use wcstok_s. 2015-02-25 20:48:01 -08:00
Steve Dower b3f51e3c44 Adds _CRT_NON_CONFORMING_WCSTOK to retain two-parameter wcstok. 2015-02-25 20:38:31 -08:00
Steve Dower a9076d6551 Issue #23461: Normalise line endings when comparing old and new contents of importlib.h 2015-02-14 09:38:19 -08:00
Steve Dower bb24087a2c Issue #23260: Update Windows installer 2015-02-05 22:08:48 -08:00
Steve Dower a5e1dbef14 Issue #23212: Update Windows copy of OpenSSL to 1.0.1l 2015-01-31 12:20:40 -08:00
Steve Dower 6b8997391b Issue #23212: Update Windows copy of OpenSSL to 1.0.1l 2015-01-31 12:19:10 -08:00
Steve Dower e5a6c4ecfc Fixes python3_d.dll build so that functions are forwarded to python35_d.dll 2015-01-31 11:17:07 -08:00
Steve Dower 2587952f2f Fixes sys.winver generation and removes dependency on user32.dll 2015-01-15 09:10:16 -08:00
Zachary Ware 7037cf7300 Closes #23154: Fix unnecessary recompilation of OpenSSL on Windows 2015-01-03 22:33:10 -06:00
Steve Dower 03a144bb6a #22980 Adds platform and version tags to .pyd files 2014-12-15 20:45:23 -08:00
Steve Dower 89fc3caedb Make bdist_wininst build only on demand 2014-12-15 17:19:27 -08:00
Zachary Ware fb8ca22ff1 Update Tcl/Tk to 8.6.3
- new file dialogs on Vista+
- tclWinTime.c was cleaned up a bit, and no
  longer uses 'timezone' (which is now _timezone
  in VS2015, so we get to avoid patching that
  file).
- rules.vc is patched in both Tcl and Tk sources
  to allow building with VS2015
2014-12-15 15:42:10 -06:00
Steve Dower c4c79a0e82 Allows nasm to be found on the system-wide path before using the version in externals. 2014-12-12 17:15:18 -08:00
Steve Dower f4f1080e2e Prevent warning MSB4057: The target "InitializeBuildStatus" does not exist in the project. 2014-12-12 13:45:25 -08:00
Steve Dower 10e65856a3 Removes use of ValueOrDefault function that is not always available on the buildbots. 2014-12-12 12:18:11 -08:00
Steve Dower 65e4cb10d9 Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release. 2014-11-22 12:54:57 -08:00
Steve Dower 8314690a26 Issue #22869: Add pylifecycle.c/.h files to pythoncore project. 2014-11-20 16:45:36 -08:00
Zachary Ware 740e1dcdc2 Issue #17896: Move Windows external lib sources from .. to externals. 2014-11-01 22:48:24 -05:00
Zachary Ware 4b2b1de0bd Issue #17896: Move Windows external lib sources from .. to externals. 2014-11-01 22:39:21 -05:00
Zachary Ware e470d092cb Issue #17717: Pull NASM from svn.python.org for OpenSSL build. 2014-11-01 18:42:46 -05:00
Zachary Ware aa3ea7ee78 Issue #17717: Pull NASM from svn.python.org for OpenSSL build. 2014-11-01 17:11:08 -05:00
Zachary Ware d838911bb9 Merge with 3.4 2014-10-25 23:05:21 -05:00
Zachary Ware 16e7f97bcb Update OpenSSL version in PCbuild\readme.txt 2014-10-25 23:05:06 -05:00
Zachary Ware b6f8fec80b Issue #22261: Add a note to PCbuild\readme.txt about MSBuild switches.
Specifically, that they can be passed at the end of a build.bat invocation.

Initial patch by Shorya Raj.
2014-10-25 22:57:05 -05:00
Zachary Ware 4dc7278546 Issue #22644: Update the Windows build to OpenSSL 1.0.1j 2014-10-17 16:31:57 -05:00
Zachary Ware baa6d3a01f Issue #22644: Update the Windows build to OpenSSL 1.0.1j 2014-10-17 16:26:30 -05:00
Zachary Ware 6f3bdc9484 Issue #21907: Partially revert changes to Windows buildbot scripts.
Trying to use run_tests.py for testing is more trouble than it's
worth; reverted to rt.bat.  Also cleaned up rt.bat a bit.

Trying to use hg purge to clean up after testing is also
error-prone, so we're back to using the build solution's Clean
targets.
2014-10-13 00:17:23 -05:00
Zachary Ware b40cf1f804 Issue #22160: Update OpenSSL to 1.0.1i for the Windows build. 2014-08-06 23:21:03 -05:00
Zachary Ware 22f2d2efb7 Issue #22160: Update OpenSSL to 1.0.1i for the Windows build. 2014-08-06 23:19:29 -05:00
Zachary Ware 2897d07623 Update prepare_ssl.py script to generate the .asm files. 2014-08-06 22:47:23 -05:00
Zachary Ware c6f8c0a1de Issue #21907: Avoid using double quotes to check argument values.
Double quotes in expanded variables can match literal double quotes,
which makes for a big mess when passing in a quoted argument (like
"/p:externalsDir=..\externals", for example).
2014-07-31 23:58:27 -05:00
Zachary Ware cb09dcacab Issue #21907: Further improvments to build_pgo.bat. Patch by Ingolf Becker. 2014-07-31 23:48:45 -05:00
Victor Stinner 115171086a Issue #22018: On Windows, signal.set_wakeup_fd() now also supports sockets.
A side effect is that Python depends to the WinSock library.
2014-07-29 23:31:34 +02:00
Zachary Ware f7152db99f Issue #18093: Give the Windows build _testembed.c's new location. 2014-07-25 08:58:07 -05:00
Nick Coghlan 973fe0ba7a Issue #18093: Factor out the programs that embed the runtime 2014-07-25 21:52:14 +10:00
Victor Stinner 1d8948e023 Backout 42ced0d023cd: oops, i didn't want to push this changeset :-/ 2014-07-24 22:51:05 +02:00
Victor Stinner d18ccd19f0 tets 2014-07-24 21:58:53 +02:00
Zachary Ware 269e83fd02 Issue #17846: Merge with 3.4 2014-07-07 14:35:02 -05:00
Zachary Ware ef03565567 Issue #17846: Clarify note about Solution Folders.
Initial patch by Kathleen Weaver.
2014-07-07 14:33:24 -05:00
Zachary Ware 345511a4a6 Merge with 3.4 2014-07-07 14:31:58 -05:00
Zachary Ware 2170b14374 Fix MSVC edition mismatch. 2014-07-07 14:31:34 -05:00
Zachary Ware e12fa65744 Issue #21907: Improved the batch scripts provided for building Python.
The user-facing scripts in PCbuild have been updated to be easier to use
and the buildbot scripts in Tools\buildbot have been updated to use the
user-facing scripts in PCbuild wherever possible.
2014-07-07 13:39:59 -05:00
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