Issue #3617: Include a licensing statement regarding the Microsoft C runtime in the...

diff --git a/Misc/NEWS b/Misc/NEWS
index 75cc88fc7493c1fc1f3bdd4c3c98b37cdea6c664..8a916f42334de20f1a3c402a1b6b3734fdec51b0 100644 (file)
--- 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 (file)
index 0000000..4d0adb2
--- /dev/null
+++ b/Tools/msi/crtlicense.txt
@@ -0,0 +1,44 @@
+\r
+\r
+Additional Conditions for this Windows binary build\r
+---------------------------------------------------\r
+\r
+This program is linked with and uses Microsoft Distributable Code,\r
+copyrighted by Microsoft Corporation. The Microsoft Distributable Code\r
+includes the following files:\r
+\r
+msvcr90.dll\r
+msvcp90.dll\r
+msvcm90.dll\r
+\r
+If you further distribute programs that include the Microsoft\r
+Distributable Code, you must comply with the restrictions on\r
+distribution specified by Microsoft. In particular, you must require\r
+distributors and external end users to agree to terms that protect the\r
+Microsoft Distributable Code at least as much as Microsoft's own\r
+requirements for the Distributable Code. See Microsoft's documentation\r
+(included in its developer tools and on its website at microsoft.com)\r
+for specific details.\r
+\r
+Redistribution of the Windows binary build of the Python interpreter\r
+complies with this agreement, provided that you do not:\r
+\r
+- alter any copyright, trademark or patent notice in Microsoft's\r
+Distributable Code;\r
+\r
+- use Microsoft\92s trademarks in your programs\92 names or in a way that\r
+suggests your programs come from or are endorsed by Microsoft;\r
+\r
+- distribute Microsoft's Distributable Code to run on a platform other\r
+than Microsoft operating systems, run-time technologies or application\r
+platforms;\r
+\r
+- include Microsoft Distributable Code in malicious, deceptive or\r
+unlawful programs; or\r
+\r
+These restrictions apply only to the Microsoft Distributable Code as\r
+defined above, not to Python itself or any programs running on the\r
+Python interpreter. The redistribution of the Python interpreter and\r
+libraries is governed by the Python Software License included with this\r
+file, or by other licenses as marked.\r
+\r

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 59ea9b56eb0d0559d67381567361627c0a0bfe3c..4748d7cdcb2a40a91364ad94a7511f70df27f4f4 100644 (file)
--- 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"),