Merge remote-tracking branch 'upstream/2.1' into 2.2

2 files changed, 29 insertions, 0 deletions

diff --git a/build/windows/__init__.py b/build/windows/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/build/windows/__init__.py
diff --git a/build/windows/signtool.py b/build/windows/signtool.py
new file mode 100644
index 0000000000..00a3ac8c16
--- /dev/null
+++ b/build/windows/signtool.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+import os
+import SCons
+from SCons.Builder import Builder
+from SCons.Script import *
+
+def signtool_path(subject_name, path):
+    print("Running signtool: ", path)
+    command = "signtool sign /n \"%s\" /v /debug %s" % (subject_name, path)
+    if os.system(command) != 0:
+        raise Exception('signtool failed: ' + command)
+
+def do_signtool(target, source, env):
+    print('do_signtool', target, source, env)
+    subject_name = env.get('SUBJECT_NAME', '')
+
+    for s in source:
+        path = str(s)
+        if path.endswith('.exe') or path.endswith('.dll'):
+            signtool_path(subject_name, path)
+
+SignTool = Builder(action = do_signtool)
+
+def generate(env):
+    env['BUILDERS']['SignTool'] = SignTool
+
+def exists(env):
+    return os.platform == 'windows'