Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b29f2d7

Browse files
committed
Merged revisions 66460-66461 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r66460 | martin.v.loewis | 2008-09-14 22:22:39 +0200 (So, 14 Sep 2008) | 1 line Issue #3617: Include a licensing statement regarding the Microsoft C runtime in the Windows installer. ........ r66461 | martin.v.loewis | 2008-09-14 22:25:40 +0200 (So, 14 Sep 2008) | 1 line Set eol-style to native. ........
1 parent 3a2fb14 commit b29f2d7

2 files changed

Lines changed: 45 additions & 0 deletions

File tree

Tools/msi/crtlicense.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
2+
3+
Additional Conditions for this Windows binary build
4+
---------------------------------------------------
5+
6+
This program is linked with and uses Microsoft Distributable Code,
7+
copyrighted by Microsoft Corporation. The Microsoft Distributable Code
8+
includes the following files:
9+
10+
msvcr90.dll
11+
msvcp90.dll
12+
msvcm90.dll
13+
14+
If you further distribute programs that include the Microsoft
15+
Distributable Code, you must comply with the restrictions on
16+
distribution specified by Microsoft. In particular, you must require
17+
distributors and external end users to agree to terms that protect the
18+
Microsoft Distributable Code at least as much as Microsoft's own
19+
requirements for the Distributable Code. See Microsoft's documentation
20+
(included in its developer tools and on its website at microsoft.com)
21+
for specific details.
22+
23+
Redistribution of the Windows binary build of the Python interpreter
24+
complies with this agreement, provided that you do not:
25+
26+
- alter any copyright, trademark or patent notice in Microsoft's
27+
Distributable Code;
28+
29+
- use Microsoft�s trademarks in your programs� names or in a way that
30+
suggests your programs come from or are endorsed by Microsoft;
31+
32+
- distribute Microsoft's Distributable Code to run on a platform other
33+
than Microsoft operating systems, run-time technologies or application
34+
platforms;
35+
36+
- include Microsoft Distributable Code in malicious, deceptive or
37+
unlawful programs; or
38+
39+
These restrictions apply only to the Microsoft Distributable Code as
40+
defined above, not to Python itself or any programs running on the
41+
Python interpreter. The redistribution of the Python interpreter and
42+
libraries is governed by the Python Software License included with this
43+
file, or by other licenses as marked.
44+

Tools/msi/msi.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,7 @@ def generate_license():
862862
import shutil, glob
863863
out = open("LICENSE.txt", "w")
864864
shutil.copyfileobj(open(os.path.join(srcdir, "LICENSE")), out)
865+
shutil.copyfileobj(open("crtlicense.txt"), out)
865866
for name, pat, file in (("bzip2","bzip2-*", "LICENSE"),
866867
("Berkeley DB", "db-*", "LICENSE"),
867868
("openssl", "openssl-*", "LICENSE"),

0 commit comments

Comments
 (0)