From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 7 Apr 2009 17:20:43 +0000 (+0000)
Subject: Merged revisions 69593 via svnmerge from
X-Git-Tag: v2.6.2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38a16e145be1f9ee02718588e94c4c33828bc4ac;p=thirdparty%2FPython%2Fcpython.git

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 959978be44b1..def396479909 100644
--- a/Tools/msi/merge.py
+++ b/Tools/msi/merge.py
@@ -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 @@ def merge(msi, feature, rootdir, modules):
     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))