commit 247a9b87bd7ad5836b00e72212f9140f0faa5c9c
author Benjamin Peterson <benjamin@python.org> Fri Feb 20 04:09:19 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Fri Feb 20 04:09:19 2009 +0000
tree e8d59bc25eeedc430a105954a73ecc5a9d89c924
parent ba01dd93d232d3cb088cd61820e814e8c4c95010

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

........
  r69415 | benjamin.peterson | 2009-02-07 13:08:22 -0600 (Sat, 07 Feb 2009) | 1 line

  make destinsrc private
........
  r69591 | martin.v.loewis | 2009-02-13 14:26:16 -0600 (Fri, 13 Feb 2009) | 1 line

  Update Tix build procedure.
........
  r69593 | martin.v.loewis | 2009-02-13 14:51:48 -0600 (Fri, 13 Feb 2009) | 1 line

  Add optional code signing after merging.
........

Tools/msi/merge.py

diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index 959978b..def3964 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 @@
     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))