[Python-3000-checkins] r66462 - in python/branches/py3k: Tools/msi/crtlicense.txt Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Sun Sep 14 22:27:52 2008
New Revision: 66462

Log:
Merged revisions 66460-66461 via svnmerge from 
svn+ssh://pythondev@svn.python.org/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.
........


Added:
   python/branches/py3k/Tools/msi/crtlicense.txt
      - copied unchanged from r66461, /python/trunk/Tools/msi/crtlicense.txt
Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Tools/msi/msi.py

Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py	(original)
+++ python/branches/py3k/Tools/msi/msi.py	Sun Sep 14 22:27:52 2008
@@ -862,6 +862,7 @@
     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"),