[Python-checkins] r71371 - in python/branches/release26-maint: Tools/msi/merge.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Tue Apr  7 19:20:43 2009
New Revision: 71371

Log:
Merged revisions 69593 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69593 | martin.v.loewis | 2009-02-13 21:51:48 +0100 (Fr, 13 Feb 2009) | 1 line
  
  Add optional code signing after merging.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Tools/msi/merge.py

Modified: python/branches/release26-maint/Tools/msi/merge.py
==============================================================================
--- python/branches/release26-maint/Tools/msi/merge.py	(original)
+++ python/branches/release26-maint/Tools/msi/merge.py	Tue Apr  7 19:20:43 2009
@@ -1,5 +1,6 @@
 import msilib,os,win32com,tempfile,sys
 PCBUILD="PCBuild"
+certname = None
 from config import *
 
 Win64 = "amd64" in PCBUILD
@@ -76,3 +77,8 @@
     db.Commit()
 
 merge(msi, "SharedCRT", "TARGETDIR", modules)
+
+# certname (from config.py) should be (a substring of)
+# the certificate subject, e.g. "Python Software Foundation"
+if certname:
+    os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/timestamp.dll %s' % (certname, msi))