diff --git a/Misc/NEWS b/Misc/NEWS index 75cc88fc749..8a916f42334 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -23,6 +23,12 @@ Tools/Demos exactly the recursion limit is exceeded. Consequently, both exception types are caught and silenced. +Build +----- + +- Issue #3617: Include a licensing statement regarding the Microsoft + C runtime in the Windows installer. + What's New in Python 2.6 release candidate 1? ============================================= diff --git a/Tools/msi/crtlicense.txt b/Tools/msi/crtlicense.txt new file mode 100644 index 00000000000..4d0adb2d7da --- /dev/null +++ b/Tools/msi/crtlicense.txt @@ -0,0 +1,44 @@ + + +Additional Conditions for this Windows binary build +--------------------------------------------------- + +This program is linked with and uses Microsoft Distributable Code, +copyrighted by Microsoft Corporation. The Microsoft Distributable Code +includes the following files: + +msvcr90.dll +msvcp90.dll +msvcm90.dll + +If you further distribute programs that include the Microsoft +Distributable Code, you must comply with the restrictions on +distribution specified by Microsoft. In particular, you must require +distributors and external end users to agree to terms that protect the +Microsoft Distributable Code at least as much as Microsoft's own +requirements for the Distributable Code. See Microsoft's documentation +(included in its developer tools and on its website at microsoft.com) +for specific details. + +Redistribution of the Windows binary build of the Python interpreter +complies with this agreement, provided that you do not: + +- alter any copyright, trademark or patent notice in Microsoft's +Distributable Code; + +- use Microsoft’s trademarks in your programs’ names or in a way that +suggests your programs come from or are endorsed by Microsoft; + +- distribute Microsoft's Distributable Code to run on a platform other +than Microsoft operating systems, run-time technologies or application +platforms; + +- include Microsoft Distributable Code in malicious, deceptive or +unlawful programs; or + +These restrictions apply only to the Microsoft Distributable Code as +defined above, not to Python itself or any programs running on the +Python interpreter. The redistribution of the Python interpreter and +libraries is governed by the Python Software License included with this +file, or by other licenses as marked. + diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 59ea9b56eb0..4748d7cdcb2 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -862,6 +862,7 @@ def generate_license(): import shutil, glob out = open("LICENSE.txt", "w") shutil.copyfileobj(open(os.path.join(srcdir, "LICENSE")), out) + shutil.copyfileobj(open("crtlicense.txt"), out) for name, pat, file in (("bzip2","bzip2-*", "LICENSE"), ("Berkeley DB", "db-*", "LICENSE"), ("openssl", "openssl-*", "LICENSE"),