Commit Graph

1036 Commits

Author SHA1 Message Date
Steve Dower da27c1da85 Merge from 3.5 2016-07-13 19:58:47 -07:00
Steve Dower 945863a691 Fixes build order and lingering intermediate files. 2016-07-13 19:58:21 -07:00
Zachary Ware 0475ffa64d Issue #26930: Merge with 3.5 2016-06-15 17:16:16 -05:00
Zachary Ware 42d4b9c22c Issue #26930: Update Windows build to OpenSSL 1.0.2h 2016-06-15 17:13:28 -05:00
Zachary Ware f88d83b922 Issue #26930: Update Windows build to OpenSSL 1.0.2h 2016-06-15 17:13:28 -05:00
Brett Cannon 82029ac14c Issue #27186: add Include/osmodule.h to the proper build rules 2016-06-12 13:21:22 -07:00
Serhiy Storchaka b0f80b0312 Issue #26647: Python interpreter now uses 16-bit wordcode instead of bytecode.
Patch by Demur Rumed.
2016-05-24 09:15:14 +03:00
Zachary Ware 15d2d49ce6 Closes #26706: Merge with 3.5 2016-04-14 10:22:58 -05:00
Zachary Ware 7d82d0366b Issue #26706: Update OpenSSL version in PCbuild/readme.txt
Thanks to Shaun Walbridge for noticing.
2016-04-14 10:22:12 -05:00
Steve Dower a4d41b3a3e Closes #26624: Adds validation of ucrtbase[d].dll version with warning for old versions. 2016-04-12 20:11:45 -07:00
Steve Dower a7a222fde7 Closes #26624: Adds validation of ucrtbase[d].dll version with warning for old versions. 2016-04-12 20:11:25 -07:00
Steve Dower 765c635dc8 Adds version info to all signed binaries on Windows 2016-04-06 12:36:23 -07:00
Steve Dower b0660582cc Adds version info to all signed binaries on Windows. 2016-04-06 12:35:24 -07:00
Victor Stinner 8c08e0db8f rt.bat: use -m test instead of Lib\test\regrtest.py 2016-03-24 17:46:24 +01:00
Steve Dower 8d9bcb5d62 Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by Bjoern Thiel. 2016-03-12 08:39:07 -08:00
Steve Dower d3722e7b6f Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by Bjoern Thiel. 2016-03-12 08:38:55 -08:00
Steve Dower 332018d17c Adds warning to prepare_ssl when nasm is not available.
Force clean externals on buildbots.
2016-03-08 12:51:19 -08:00
Steve Dower 79993a90e2 Adds warning to prepare_ssl when nasm is not available.
Force clean of externals on buildbots.
2016-03-08 12:50:57 -08:00
Steve Dower 43cbd05b6c Issue #26465: Update Windows builds to use OpenSSL 1.0.2g. 2016-03-08 10:29:24 -08:00
Steve Dower 947f411b0d Issue #26465: Update Windows builds to use OpenSSL 1.0.2g. 2016-03-08 10:26:52 -08:00
Zachary Ware 72f2ef4137 Issue #26268: Merge with 3.5 2016-02-22 04:16:33 -06:00
Zachary Ware 6fe57ad229 Issue #26268: Update Windows builds to use OpenSSL 1.0.2f 2016-02-22 04:08:51 -06:00
Zachary Ware 16f164e9b8 Issue #26268: Update the prepare_ssl.py script
It can now handle OpenSSL versions 1.0.2e and greater, which don't
include include files in include/.

Note that sources prepared by this script no longer support the old
project files for 2.7; you now have to have Perl available to use
the old build_ssl.py script with sources from svn.python.org.
2016-02-22 04:02:30 -06:00
Steve Dower a74826b086 Updates build to use SHA256 hash when signing files 2016-02-08 09:27:44 -08:00
Steve Dower 84d9fe3953 Updates build to use SHA256 hash when signing files. 2016-02-08 09:24:46 -08:00
Zachary Ware 03178a5f7e Issue #25934: Merge with 3.5 2016-01-29 19:09:41 -06:00
Zachary Ware 4c5ad9452b Issue #25934: Default to /fp:strict for ICC builds 2016-01-29 19:08:55 -06:00
Zachary Ware e2c9adb03b Closes #25348: Merge with 3.5 2016-01-12 01:31:21 -06:00
Zachary Ware bed30c37d8 Issue #25348: Add --pgo and --pgo-job flags to PCbuild\build.bat 2016-01-12 01:26:50 -06:00
Steve Dower bfb03a470c Merge from 3.5 2015-10-31 13:07:44 -07:00
Steve Dower 940f6a8f11 Improves handling of test markers for building Python without intefering with actual installs. 2015-10-31 12:17:11 -07:00
Steve Dower 80b31402d5 Issue #25361: Disables use of SSE2 instructions in Windows 32-bit build 2015-10-11 15:16:21 -07:00
Steve Dower 5700ae877f Issue #25361: Disables use of SSE2 instructions in Windows 32-bit build 2015-10-11 15:15:52 -07:00
Zachary Ware d038b78599 Closes #25022: Merge with 3.5 2015-09-10 15:03:02 -05:00
Zachary Ware 018e380d55 Issue #25022: Merge with 3.4 2015-09-10 15:02:14 -05:00
Zachary Ware 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
Larry Hastings 334b4a3403 Merge from 3.5. 2015-09-09 07:00:54 -07:00
Larry Hastings ded28e3863 Merge Python 3.5.0rc4 back to hg.python.org. 2015-09-09 06:52:38 -07:00
Steve Dower fcbe1df4af Issue #25027: Reverts partial-static build options and adds vcruntime140.dll to Windows installation. 2015-09-08 21:39:01 -07:00
Zachary Ware 4da050a276 Update PCbuild/readme.txt (merge from 3.5) 2015-09-08 01:12:56 -05:00
Zachary Ware 875ef4c70a Update PCbuild/readme.txt 2015-09-08 01:12:00 -05:00
Zachary Ware fcec42c3a8 Closes #25010: Merge with 3.5 2015-09-07 23:32:10 -05:00
Zachary Ware 70b7539f9c Issue #25010: Merge with 3.4 2015-09-07 23:31:49 -05:00
Zachary Ware 1a690fb65a Issue #25010: Fix path for .pyd example project.
Patch by Shaun Walbridge
2015-09-07 23:30:46 -05:00
Zachary Ware 99cfed77c4 Issue #24986: Merge with 3.5 2015-09-04 01:12:44 -05:00
Zachary Ware 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
Serhiy Storchaka 8fc0d918eb Merge 3.5 2015-09-04 08:34:57 +03:00
Zachary Ware 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
Zachary Ware 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
Zachary Ware 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
Zachary Ware 8cbb013553 Merge with 3.5 2015-09-02 15:01:42 -05:00
Zachary Ware 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
Martin Panter 9955a373a8 Various minor typos in documentation and comments 2015-10-07 10:26:23 +00:00
Steve Dower b98046b206 Fixes file that did not graft correctly. 2015-08-19 08:44:05 -07:00
Steve Dower ab2a34abb7 Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk. 2015-08-19 08:39:12 -07:00
Steve Dower 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
Steve Dower 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
Steve Dower 572183cce3 Merge with 3.5 2015-08-18 16:01:25 -07:00
Steve Dower 9f0cbbc376 Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk. 2015-08-18 16:00:56 -07:00
Steve Dower 079e080765 Issue #19450: Update Windows builds to use SQLite 3.8.11.0 2015-07-28 11:11:58 -07:00
Steve Dower 4e167ca7c1 Issue #19450: Update Windows builds to use SQLite 3.8.11.0 2015-07-28 11:09:40 -07:00
Steve Dower 54d361fd86 Issue #19450: Update Windows builds to use SQLite 3.8.11.0 2015-07-28 11:05:18 -07:00
Steve Dower 9c11d91b50 Merge with 3.5 2015-07-27 14:59:00 -07:00
Steve Dower de9fb28bf1 Allow intermediate build directory to be overridden. 2015-07-27 14:56:58 -07:00
Zachary Ware bdaaf49cea Issue #24603: Merge with 3.5 2015-07-21 23:28:28 -05:00
Zachary Ware 80acc3ebbc Issue #24603: Update the Windows build to use OpenSSL 1.0.2d 2015-07-21 23:27:08 -05:00
Zachary Ware 689b55c1cb Issue #24603: Update the Windows build to use OpenSSL 1.0.2d 2015-07-21 23:20:47 -05:00
Steve Dower 8a40b6bbcc Fixes argument handling in build.bat and HHC search 2015-07-20 21:35:38 -07:00
Steve Dower e1f6805776 Fixes argument handling in build.bat and HHC search 2015-07-20 21:34:45 -07:00
Steve Dower 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
Steve Dower 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
Steve Dower df418b67ab Issue #24432: Update Windows builds to use OpenSSL 1.0.2c. 2015-07-03 15:17:17 -07:00
Steve Dower f92673c254 Issue #24432: Update Windows builds to use OpenSSL 1.0.2c. 2015-07-03 15:16:37 -07:00
Steve Dower a09ef0389b Issue #24432: Update Windows builds to use OpenSSL 1.0.2c. 2015-07-03 15:13:48 -07:00
Steve Dower 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
Steve Dower 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
Steve Dower 81fdd0b868 Issue 24476: Statically links vcruntime140.dll and removes it from the installer 2015-06-19 13:08:58 -07:00
Steve Dower 6d58f8dc52 Issue 24476: Statically links vcruntime140.dll and removes it from the installer 2015-06-19 10:49:04 -07:00
Zachary Ware 4132b30636 Merge PCbuild/readme.txt update from 3.5 2015-06-17 09:48:19 -05:00
Zachary Ware 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
Zachary Ware 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
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