diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2008-09-14 20:22:39 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2008-09-14 20:22:39 (GMT) |
commit | 4eb18f9d5db1d87d78619540d41ee6b625468b74 (patch) | |
tree | 7bcae011fdbffd84d9ee894341f7a0d2db0dc0de /Tools | |
parent | 881c4878cbf24fe529eff9865d961c5882d39688 (diff) | |
download | cpython-4eb18f9d5db1d87d78619540d41ee6b625468b74.zip cpython-4eb18f9d5db1d87d78619540d41ee6b625468b74.tar.gz cpython-4eb18f9d5db1d87d78619540d41ee6b625468b74.tar.bz2 |
Issue #3617: Include a licensing statement regarding the Microsoft C runtime in the Windows installer.
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/msi/crtlicense.txt | 44 | ||||
-rw-r--r-- | Tools/msi/msi.py | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/Tools/msi/crtlicense.txt b/Tools/msi/crtlicense.txt new file mode 100644 index 0000000..4d0adb2 --- /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 59ea9b5..4748d7c 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"), |