2 files changed, 20 insertions, 0 deletions
diff --git a/remoting/tools/candle_and_light.py b/remoting/tools/candle_and_light.py
index 056bffd..74a2572 100755
--- a/remoting/tools/candle_and_light.py
+++ b/remoting/tools/candle_and_light.py
@@ -23,6 +23,7 @@ def main():
   parser = OptionParser()
   parser.add_option('--wix_path', dest='wix_path')
   parser.add_option('--version', dest='version')
+  parser.add_option('--controller_clsid', dest='controller_clsid')
   parser.add_option('--product_dir', dest='product_dir')
   parser.add_option('--intermediate_dir', dest='intermediate_dir')
   parser.add_option('--sas_dll_path', dest='sas_dll_path')
@@ -42,6 +43,7 @@ def main():
       '-ext "%(wix_path)s\\WixFirewallExtension.dll" '
       '-ext "%(wix_path)s\\WixUIExtension.dll" '
       '-ext "%(wix_path)s\\WixUtilExtension.dll" '
+      '"-dControllerClsid="%(controller_clsid)s"" '
       '-dVersion=%(version)s '
       '"-dFileSource=%(product_dir)s" '
       '-dIconPath=resources/chromoting.ico '
diff --git a/remoting/tools/uuidgen.py b/remoting/tools/uuidgen.py
new file mode 100755
index 0000000..ed1e415
--- /dev/null
+++ b/remoting/tools/uuidgen.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+uuidgen.py -- UUID generation utility.
+"""
+
+import sys
+import uuid
+
+def main():
+  print uuid.uuid4()
+  return 0
+
+if __name__ == '__main__':
+  sys.exit(main())