Merge lp:~alecu/ubuntuone-windows-installer/tunnel-use-console into lp:ubuntuone-windows-installer

[Alejandro J. Cura]

- Syncdaemon expects proxy-tunnel to output port info to stdout. (LP: #1006899)

[dobey (dobey)]

review: Approve

[Brian Curtin (brian.curtin)]

I've built an installer for this at http://ubuntuone.com/1y4nTEL7pEcRJ8TgOg3MqW but as you'll notice, this change causes the tunnel to show a command window.

review: Needs Fixing

[Manuel de la Peña (mandel)]

It might be a super dirty trick but can we use a batch that launches the .exe and hides the need of the windows? I found a small example using start: http://stackoverflow.com/questions/507347/hide-command-window-of-bat-file-that-executes-another-exe-file

As I said, just a dirty trick :(

[Alejandro J. Cura (alecu)]

Hi Brian, thanks for your review.

Please rebuild the installer with this patch for twisted:
lp:~alecu/twisted/dont-open-console-window/

thanks!

[Alejandro J. Cura (alecu)]

The installer rebuilt by Brian worked as expected, so I guess this branch is ready to be approved.
On a related subject we should include the twisted patch on the installer being built by Jenkins.

[Brian Curtin (brian.curtin)]

When paired with that twisted branch, +1

review: Approve

=== modified file 'scripts/setup.py'
--- scripts/setup.py	2012-05-10 21:49:51 +0000
+++ scripts/setup.py	2012-06-01 04:10:23 +0000
@@ -295,6 +295,9 @@
         {
             'script': 'bin/u1sdtool',
         },
+        {
+            'script': 'bin/ubuntuone-proxy-tunnel',
+        },
     ]
 
     windows = [
@@ -303,10 +306,6 @@
             'icon_resources': [(0, 'ubuntu_one.ico')]
         },
         {
-            'script': 'bin/ubuntuone-proxy-tunnel',
-            'icon_resources': [(0, 'ubuntu_one.ico')]
-        },
-        {
             'script': 'bin/ubuntuone-control-panel-qt',
             'icon_resources': [(0, 'ubuntu_one.ico')]
         },