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.
........

diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index 959978be44b18d646528201d91672018c235a002..def396479909e8b798023bb7265e4333ebdbd272 100644 (file)
--- a/Tools/msi/merge.py
+++ b/Tools/msi/merge.py
@@ -1,5 +1,6 @@
 import msilib,os,win32com,tempfile,sys\r
 PCBUILD="PCBuild"\r
+certname = None\r
 from config import *\r
 \r
 Win64 = "amd64" in PCBUILD\r
@@ -76,3 +77,8 @@ def merge(msi, feature, rootdir, modules):
     db.Commit()\r
 \r
 merge(msi, "SharedCRT", "TARGETDIR", modules)\r
+\r
+# certname (from config.py) should be (a substring of)\r
+# the certificate subject, e.g. "Python Software Foundation"\r
+if certname:\r
+    os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/timestamp.dll %s' % (certname, msi))\r