018e380d55
Issue #25022 : Merge with 3.4
2015-09-10 15:02:14 -05:00
b54a068204
Issue #25022 : Remove PC/example_nt/
...
It was very much outdated, and the topic is better covered elsewhere.
2015-09-10 14:37:42 -05:00
334b4a3403
Merge from 3.5.
2015-09-09 07:00:54 -07:00
ded28e3863
Merge Python 3.5.0rc4 back to hg.python.org.
2015-09-09 06:52:38 -07:00
fcbe1df4af
Issue #25027 : Reverts partial-static build options and adds vcruntime140.dll to Windows installation.
2015-09-08 21:39:01 -07:00
4da050a276
Update PCbuild/readme.txt (merge from 3.5)
2015-09-08 01:12:56 -05:00
875ef4c70a
Update PCbuild/readme.txt
2015-09-08 01:12:00 -05:00
fcec42c3a8
Closes #25010 : Merge with 3.5
2015-09-07 23:32:10 -05:00
70b7539f9c
Issue #25010 : Merge with 3.4
2015-09-07 23:31:49 -05:00
1a690fb65a
Issue #25010 : Fix path for .pyd example project.
...
Patch by Shaun Walbridge
2015-09-07 23:30:46 -05:00
99cfed77c4
Issue #24986 : Merge with 3.5
2015-09-04 01:12:44 -05:00
a6deff2588
Issue #24986 : Save some bandwidth from svn.python.org
...
Don't download sources that won't be used.
2015-09-04 01:10:23 -05:00
8fc0d918eb
Merge 3.5
2015-09-04 08:34:57 +03:00
b27f3c3e20
Issue #24986 : Allow building Python without external libraries on Windows
...
This modifies the behavior of the '-e' flag to PCbuild\build.bat: when '-e'
is not supplied, no attempt will be made to build extension modules that
require external libraries, even if the external libraries are present.
Also adds '--no-<module>' flags to PCbuild\build.bat, where '<module>' is
one of 'ssl', 'tkinter', or 'bsddb', to allow skipping just those modules
(if '-e' is given).
2015-09-03 23:43:54 -05:00
e74fe18ebb
Allow PCbuild\rt.bat to accept unlimited arguments for regrtest.
...
This makes it possible to pass more than 4 tests by name through
Tools\buildbot\test.bat
2015-09-03 23:43:37 -05:00
6732343ade
Turn 'rem' comments into a real usage message in PCbuild/build.bat
...
Also fixes error in 'kill' target (already fixed in 2.7, somehow the fix
didn't make it to this branch).
2015-09-02 13:21:19 -05:00
8cbb013553
Merge with 3.5
2015-09-02 15:01:42 -05:00
677744b386
Closes #25456 : Copy Tcl/Tk DLLs to build directory on Windows
...
This removes the need to add externals/tcltk[64]/bin to PATH to be able
to import tkinter. Also documents the necessity for the DLLs to be
on PATH or in python.exe's directory.
2015-10-24 01:34:22 -05:00
9955a373a8
Various minor typos in documentation and comments
2015-10-07 10:26:23 +00:00
b98046b206
Fixes file that did not graft correctly.
2015-08-19 08:44:05 -07:00
ab2a34abb7
Issue #24847 : Removes vcruntime140.dll dependency from Tcl/Tk.
2015-08-19 08:39:12 -07:00
77861e17f1
Issue #24847 : Fixes Tix revision number and reverts fix for the wrong revision.
...
Triggers clean on buildbots.
2015-08-18 19:30:13 -07:00
e7e69391e3
Issue #24847 : Fixes Tix revision number and reverts fix for the wrong revision.
...
Triggers clean on buildbots.
2015-08-18 19:29:51 -07:00
572183cce3
Merge with 3.5
2015-08-18 16:01:25 -07:00
9f0cbbc376
Issue #24847 : Removes vcruntime140.dll dependency from Tcl/Tk.
2015-08-18 16:00:56 -07:00
079e080765
Issue #19450 : Update Windows builds to use SQLite 3.8.11.0
2015-07-28 11:11:58 -07:00
4e167ca7c1
Issue #19450 : Update Windows builds to use SQLite 3.8.11.0
2015-07-28 11:09:40 -07:00
54d361fd86
Issue #19450 : Update Windows builds to use SQLite 3.8.11.0
2015-07-28 11:05:18 -07:00
9c11d91b50
Merge with 3.5
2015-07-27 14:59:00 -07:00
de9fb28bf1
Allow intermediate build directory to be overridden.
2015-07-27 14:56:58 -07:00
bdaaf49cea
Issue #24603 : Merge with 3.5
2015-07-21 23:28:28 -05:00
80acc3ebbc
Issue #24603 : Update the Windows build to use OpenSSL 1.0.2d
2015-07-21 23:27:08 -05:00
689b55c1cb
Issue #24603 : Update the Windows build to use OpenSSL 1.0.2d
2015-07-21 23:20:47 -05:00
8a40b6bbcc
Fixes argument handling in build.bat and HHC search
2015-07-20 21:35:38 -07:00
e1f6805776
Fixes argument handling in build.bat and HHC search
2015-07-20 21:34:45 -07:00
67b9ab53c9
Issue #24585 : Enables build-to-build upgrades that preserve settings.
...
Rather than using Burn "Persisted" variables we now add registry keys for each added feature. These can be detected by the installer regardless of which version installed them, and we use this for Modify and Upgrade. In particular, Upgrades can't access the Persisted variables, but can find well-known registry keys.
There are also some changes to the bootstrap app to properly handle upgrades.
Finally, a few minor improvements to the Windows build to keep things tidier.
2015-07-08 20:19:07 -07:00
494374922c
Issue #24585 : Enables build-to-build upgrades that preserve settings.
...
Rather than using Burn "Persisted" variables we now add registry keys for each added feature. These can be detected by the installer regardless of which version installed them, and we use this for Modify and Upgrade. In particular, Upgrades can't access the Persisted variables, but can find well-known registry keys.
There are also some changes to the bootstrap app to properly handle upgrades.
Finally, a few minor improvements to the Windows build to keep things tidier.
2015-07-08 20:18:44 -07:00
df418b67ab
Issue #24432 : Update Windows builds to use OpenSSL 1.0.2c.
2015-07-03 15:17:17 -07:00
f92673c254
Issue #24432 : Update Windows builds to use OpenSSL 1.0.2c.
2015-07-03 15:16:37 -07:00
a09ef0389b
Issue #24432 : Update Windows builds to use OpenSSL 1.0.2c.
2015-07-03 15:13:48 -07:00
0a34c49603
Fixes warnings when building python3.dll due to the .def file accumulating multiple copies of each line.
...
Adds shebang line to prepare_ssl so it will run with py.exe.
2015-07-03 12:21:29 -07:00
ac2bd5b1e8
Fixes warnings when building python3.dll due to the .def file accumulating multiple copies of each line.
...
Adds shebang line to prepare_ssl so it will run with py.exe.
2015-07-03 09:08:47 -07:00
81fdd0b868
Issue 24476: Statically links vcruntime140.dll and removes it from the installer
2015-06-19 13:08:58 -07:00
6d58f8dc52
Issue 24476: Statically links vcruntime140.dll and removes it from the installer
2015-06-19 10:49:04 -07:00
4132b30636
Merge PCbuild/readme.txt update from 3.5
2015-06-17 09:48:19 -05:00
6c7f2acd99
Merge 3.4's PCbuild/readme.txt update.
...
All the new information in 3.4's readme.txt was already here, but the
wrong name was used to refer to the script. Also reworded the sentence.
2015-06-17 09:45:22 -05:00
d1f7c594fa
Update PCbuild/readme.txt
...
It now recommends PCbuild/get_externals.bat instead of the scripts in
Tools/buildbot.
2015-06-16 23:27:56 -05:00
27da359519
Merge with 3.5
2015-06-10 00:44:40 -05:00
785273cd84
Merge forward extras beyond #21907 backport.
2015-06-10 00:43:20 -05:00
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
b980c05ef8
Issue #24376 : Bumps xxlimited.vcxproj to use 3.6 limited ABI.
2015-06-03 11:05:57 -07:00
405c7f0712
Issue #24376 : xxlimited.c errors when building 32 and 64 bit on Windows
2015-06-03 11:04:44 -07:00
b6c6a4dc04
Issue #24376 : xxlimited.c errors when building 32 and 64 bit on Windows
2015-06-03 11:03:15 -07:00
97abf97e45
Merge from 3.5.
2015-05-30 14:56:30 -06:00
dce09c34a0
Issue #16991 : Add odictobject.h on Windows.
2015-05-30 14:56:04 -06:00
7aa5341164
Reverting my previous commit.
...
Something went horribly wrong when I was doing `hg rebase`.
2015-05-30 10:57:56 -04:00
41a6a625d4
Update Windows build for 3.6
2015-05-28 17:30:03 -05:00
42a059b632
Issue #24268 : Adds PCBuild project to build _testmultiphase module.
2015-05-23 17:51:54 -07:00
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
f54bcfb835
Updates PCBuild.sln to open with VS 2015 by default.
2015-05-20 09:30:42 -07:00
c8241cfb8c
Issue #24186 : Disable optimised OpenSSL functions on 64-bit Windows to avoid crashing.
2015-05-13 21:44:02 -07:00
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
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
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
50ebf0316a
Merge with 3.4
2015-04-13 12:30:53 -05:00
30cc6fae98
Force the Windows readme to CRLF
2015-04-13 12:28:11 -05:00
774ac377da
Closes #17202 : Merge with 3.4
2015-04-13 12:11:40 -05:00
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
7dfa094e78
Closes #18402 : Merge with 3.4
2015-04-13 10:53:11 -05:00
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
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
9f3109c459
Issue #23686 : Update Windows build to use OpenSSL 1.0.2a.
2015-04-07 19:59:37 -05:00
c7d979f022
Closes #23686 : Update Windows installer OpenSSL to 1.0.2a
2015-04-11 23:36:04 -04:00
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
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
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
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
f63dab5a84
Back-out wcstok deprecation suppression and updates calls to use wcstok_s.
2015-02-25 20:48:01 -08:00
b3f51e3c44
Adds _CRT_NON_CONFORMING_WCSTOK to retain two-parameter wcstok.
2015-02-25 20:38:31 -08:00
a9076d6551
Issue #23461 : Normalise line endings when comparing old and new contents of importlib.h
2015-02-14 09:38:19 -08:00
bb24087a2c
Issue #23260 : Update Windows installer
2015-02-05 22:08:48 -08:00
a5e1dbef14
Issue #23212 : Update Windows copy of OpenSSL to 1.0.1l
2015-01-31 12:20:40 -08:00
6b8997391b
Issue #23212 : Update Windows copy of OpenSSL to 1.0.1l
2015-01-31 12:19:10 -08:00
e5a6c4ecfc
Fixes python3_d.dll build so that functions are forwarded to python35_d.dll
2015-01-31 11:17:07 -08:00
2587952f2f
Fixes sys.winver generation and removes dependency on user32.dll
2015-01-15 09:10:16 -08:00
7037cf7300
Closes #23154 : Fix unnecessary recompilation of OpenSSL on Windows
2015-01-03 22:33:10 -06:00
03a144bb6a
#22980 Adds platform and version tags to .pyd files
2014-12-15 20:45:23 -08:00
89fc3caedb
Make bdist_wininst build only on demand
2014-12-15 17:19:27 -08:00
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
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
f4f1080e2e
Prevent warning MSB4057: The target "InitializeBuildStatus" does not exist in the project.
2014-12-12 13:45:25 -08:00
10e65856a3
Removes use of ValueOrDefault function that is not always available on the buildbots.
2014-12-12 12:18:11 -08:00
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
8314690a26
Issue #22869 : Add pylifecycle.c/.h files to pythoncore project.
2014-11-20 16:45:36 -08:00
740e1dcdc2
Issue #17896 : Move Windows external lib sources from .. to externals.
2014-11-01 22:48:24 -05:00
4b2b1de0bd
Issue #17896 : Move Windows external lib sources from .. to externals.
2014-11-01 22:39:21 -05:00
e470d092cb
Issue #17717 : Pull NASM from svn.python.org for OpenSSL build.
2014-11-01 18:42:46 -05:00
aa3ea7ee78
Issue #17717 : Pull NASM from svn.python.org for OpenSSL build.
2014-11-01 17:11:08 -05:00
d838911bb9
Merge with 3.4
2014-10-25 23:05:21 -05:00
16e7f97bcb
Update OpenSSL version in PCbuild\readme.txt
2014-10-25 23:05:06 -05:00
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
4dc7278546
Issue #22644 : Update the Windows build to OpenSSL 1.0.1j
2014-10-17 16:31:57 -05:00
baa6d3a01f
Issue #22644 : Update the Windows build to OpenSSL 1.0.1j
2014-10-17 16:26:30 -05:00
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
b40cf1f804
Issue #22160 : Update OpenSSL to 1.0.1i for the Windows build.
2014-08-06 23:21:03 -05:00
22f2d2efb7
Issue #22160 : Update OpenSSL to 1.0.1i for the Windows build.
2014-08-06 23:19:29 -05:00
2897d07623
Update prepare_ssl.py script to generate the .asm files.
2014-08-06 22:47:23 -05:00
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
cb09dcacab
Issue #21907 : Further improvments to build_pgo.bat. Patch by Ingolf Becker.
2014-07-31 23:48:45 -05:00
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
f7152db99f
Issue #18093 : Give the Windows build _testembed.c's new location.
2014-07-25 08:58:07 -05:00
973fe0ba7a
Issue #18093 : Factor out the programs that embed the runtime
2014-07-25 21:52:14 +10:00
1d8948e023
Backout 42ced0d023cd: oops, i didn't want to push this changeset :-/
2014-07-24 22:51:05 +02:00
d18ccd19f0
tets
2014-07-24 21:58:53 +02:00
269e83fd02
Issue #17846 : Merge with 3.4
2014-07-07 14:35:02 -05:00
ef03565567
Issue #17846 : Clarify note about Solution Folders.
...
Initial patch by Kathleen Weaver.
2014-07-07 14:33:24 -05:00
345511a4a6
Merge with 3.4
2014-07-07 14:31:58 -05:00
2170b14374
Fix MSVC edition mismatch.
2014-07-07 14:31:34 -05:00
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
6315ffa339
Merge.
2014-06-20 22:41:21 +01:00
a4d1e461a7
Merge with 3.4
2014-06-13 09:43:32 -05:00
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
ff7cfb21d9
Issue #21745 : Merge with 3.4
2014-06-13 09:39:24 -05:00
4856a6ae7d
Issue #21745 : Mention VS2010 SP1 as a solution for LNK1123 errors
2014-06-13 09:38:50 -05:00
3266a8fa59
Issue #21671 : Merge with 3.4
2014-06-06 01:27:34 -05:00
7d55da42a4
Issue #21671 , CVE-2014-0224: Update the Windows build to openssl-1.0.1h
2014-06-06 01:23:53 -05:00
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
90441e857d
Issue #21623 : open pyproject.props with an explicit encoding
2014-06-02 12:09:13 -05:00
4b8dd71d0a
Issue21452 Add missing backslash to build path for make_buildinfo
2014-05-09 18:19:31 +01:00
877013fe14
Merge
2014-05-09 18:19:13 +01:00
55c2364561
Issue21452 Add missing backslash to build path for make_buildinfo
2014-05-09 18:18:11 +01:00
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
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
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
b9e71d4a55
Merge with 3.4
2014-05-01 15:18:43 +02:00
3d5c9e2c67
Update to 1.0.1g
2014-05-01 14:28:48 +02:00
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
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
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
4b87dc6e83
Add tcltk.props to "Visual Studio properties" section of PCbuild/readme.txt.
2014-03-28 23:36:43 -05:00
808676b432
Merge with 3.4
2014-03-28 23:31:53 -05:00
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
92497a42b7
Issue #21017 : Enable Tix debug build on Windows
2014-03-22 10:37:06 -05:00
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
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
26e417b182
Merge with 3.4
2014-03-19 14:47:49 -05:00
5f3e3c3429
Use the correct VS edition names in PCbuild/readme.txt
2014-03-19 14:46:25 -05:00
4278b2d782
Merge xxlimited compile warning fix from 3.4
2014-03-18 23:09:00 -05:00
232b017607
Avoid compile warning in xxlimited on 32-bit Windows non-Debug builds.
2014-03-18 23:05:01 -05:00
0e5e4a4085
Merge PCbuild/pcbuild.sln cleanup from 3.4
2014-03-18 22:40:23 -05:00
Zachary Ware
Larry Hastings
Steve Dower
Serhiy Storchaka
Martin Panter
Eric Snow
Yury Selivanov
Gregory P. Smith
Victor Stinner
Nick Coghlan
Charles-François Natali
Tim Golden
Martin v. Löwis