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
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
Larry Hastings
Steve Dower
Zachary Ware
Serhiy Storchaka
Eric Snow