Commit ed72e275 authored by Serhiy Storchaka's avatar Serhiy Storchaka

Merge heads

parents a21f4adc b0eee834
...@@ -306,6 +306,8 @@ Tools/Demos ...@@ -306,6 +306,8 @@ Tools/Demos
Build Build
----- -----
- Issue #16067: Add description into MSI file to replace installer's temporary name.
- Issue #18256: Compilation fix for recent AIX releases. Patch by - Issue #18256: Compilation fix for recent AIX releases. Patch by
David Edelsohn. David Edelsohn.
......
...@@ -1410,7 +1410,10 @@ merge(msiname, "SharedCRT", "TARGETDIR", modules) ...@@ -1410,7 +1410,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()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment