Merge lp:~brian.curtin/ubuntuone-windows-installer/include-installer into lp:ubuntuone-windows-installer

[Brian Curtin]

- Add ubuntuone-updater to setup.py so it gets built and included in installers. (lp:1105472)

Include the ubuntuone-updater script in setup.py so it gets py2exe'd and included in installers.

[dobey (dobey)]

review: Approve

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'scripts/setup.py'
--- scripts/setup.py	2012-11-02 13:48:22 +0000
+++ scripts/setup.py	2013-01-25 22:00:34 +0000
@@ -205,6 +205,11 @@
             "ubuntuone-control-panel", "bin",
             "ubuntuone-control-panel-qt"),
             os.path.join("bin", "ubuntuone-control-panel-qt"))
+        shutil.copyfile(os.path.join("sources",
+            "ubuntuone-control-panel", "bin",
+            "ubuntuone-updater"),
+            os.path.join("bin", "ubuntuone-updater"))
+
 
         # Remove "installed" copy
         try:
@@ -321,6 +326,10 @@
             'icon_resources': [(0, 'ubuntuone.ico')]
         },
         {
+            'script': 'bin/ubuntuone-updater',
+            'icon_resources': [(0, 'ubuntuone.ico')]
+        },
+        {
             'script': 'bin/ubuntuone-control-panel-qt',
             'icon_resources': [(0, 'ubuntuone.ico')]
         },