Merge heads

This commit is contained in:
Serhiy Storchaka 2013-08-03 21:17:27 +03:00
commit 616c44188d
2 changed files with 7 additions and 1 deletions

View File

@ -765,6 +765,9 @@ Windows
Build Build
----- -----
- Issue #16067: Add description into MSI file to replace installer's
temporary name.
- Issue #18257: Fix readlink usage in python-config. Install the python - Issue #18257: Fix readlink usage in python-config. Install the python
version again on Darwin. version again on Darwin.

View File

@ -1415,7 +1415,10 @@ merge(msiname, "SharedCRT", "TARGETDIR", modules)
# certname (from config.py) should be (a substring of) # certname (from config.py) should be (a substring of)
# the certificate subject, e.g. "Python Software Foundation" # the certificate subject, e.g. "Python Software Foundation"
if certname: if certname:
os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/timestamp.dll %s' % (certname, msiname)) os.system('signtool sign /n "%s" '
'/t http://timestamp.verisign.com/scripts/timestamp.dll '
'/d "Python %s" '
'%s' % (certname, full_current_version, msiname))
if pdbzip: if pdbzip:
build_pdbzip() build_pdbzip()