Merge lp:~ralsina/ubuntuone-windows-installer/fix_809873 into lp:ubuntuone-windows-installer

[Roberto Alsina]

Add a scripts folder containing the bundle-making script and the bitrock installer project

Add a scripts folder containing the bundle-making script and the bitrock installer project

[lp:~ralsina/ubuntuone-windows-installer/fix_809873]

24. By Roberto Alsina on 2011-07-14

Run wizard in background

25. By Roberto Alsina on 2011-07-14

tweak

26. By Roberto Alsina on 2011-07-14

instructions

27. By Roberto Alsina on 2011-07-14

modular commands

28. By Roberto Alsina on 2011-07-14

style fixes

29. By Roberto Alsina on 2011-07-14

use the same version number

30. By Roberto Alsina on 2011-07-14

Take conf files from sources instead of keepinga copy

[Shane Fagan (shanepatrickfagan)]

Made the exes then tested on a clean XP install and its working perfect +1

review: Approve (irl test)

[lp:~ralsina/ubuntuone-windows-installer/fix_809873]

31. By Roberto Alsina on 2011-07-22

manually copy ubuntu_sso

32. By Roberto Alsina on 2011-07-22

make it work from trunk, style fixes

33. By Roberto Alsina on 2011-07-31

Add fix for win32com usage

34. By Roberto Alsina on 2011-08-02

add icon for setup (just for testing purposes)

35. By Roberto Alsina on 2011-08-03

no more embedded_sso

36. By Roberto Alsina on 2011-08-04

Copy config files to the right place, set registry keys accordingly.

37. By Roberto Alsina on 2011-08-09

Ignore DLLs that break XP, embed vcredist in the installer.

38. By Roberto Alsina on 2011-08-09

More vcredist support, copy pem files

39. By Roberto Alsina on 2011-08-09

typo

40. By Roberto Alsina on 2011-08-10

Don't use cmd windows

41. By Roberto Alsina on 2011-08-10

only upgrade/install vc_redist if needed

42. By Roberto Alsina on 2011-08-10

fail quietly if vc_redist is installed

43. By Roberto Alsina on 2011-08-16

pep8 fixes

44. By Roberto Alsina on 2011-08-18

Only provide access to the wizard, which will start u1cp if needed

45. By Roberto Alsina on 2011-08-18

start uninstaller with UI from the menu

46. By Roberto Alsina on 2011-08-23

add wizard to the menu temporarily

47. By Roberto Alsina on 2011-08-24

Add missing configglue bits

48. By Roberto Alsina on 2011-08-29

Provide revnos in the installer

49. By Roberto Alsina on 2011-08-30

Keep install.log

50. By Roberto Alsina on 2011-08-31

Fix cparrino's handoff bug

51. By Roberto Alsina on 2011-09-02

Fix for bug 839906 (icon on taskbar was not correct)

52. By Roberto Alsina on 2011-09-07

Changed title in the bitrock window

53. By Roberto Alsina on 2011-09-08

installer tuning

54. By Roberto Alsina on 2011-09-08

delete the temp files reported on bug 840178

55. By Roberto Alsina on 2011-09-09

don't ship get_credentials

56. By Roberto Alsina on 2011-09-12

Added Ubuntu One folder to the start menu

57. By Roberto Alsina on 2011-09-13

use --mode win32 on uninstaller

58. By Roberto Alsina on 2011-09-15

Fix metadata

59. By Roberto Alsina on 2011-09-15

Fix metadata

60. By Roberto Alsina on 2011-09-16

merged mandel's autoupdate branch

61. By Roberto Alsina on 2011-09-16

merged trunk

62. By Roberto Alsina on 2011-09-16

new release

63. By Roberto Alsina on 2011-09-20

updated instructions

64. By Roberto Alsina on 2011-09-21

add --installer argument

65. By Roberto Alsina on 2011-09-21

setting version numbers for new release

66. By Roberto Alsina on 2011-09-26

Don't start u1cp on upgrades

67. By Roberto Alsina on 2011-09-26

build 200, version 2.0

68. By Roberto Alsina on 2011-10-07

version 2.0.1 build 201

69. By Roberto Alsina on 2011-11-15

Only set upgrade mode when uninstall.exe exists

70. By Roberto Alsina on 2011-11-18

Use the new name of the SSO binary

71. By Roberto Alsina on 2011-11-18

This is version 2.0.2 build 202

72. By Roberto Alsina on 2011-11-18

Use the new name of the SSO binary

73. By Roberto Alsina on 2011-11-18

Version 2.0.2, build 202

74. By Roberto Alsina on 2011-12-06

Fix for vista autoupdate

75. By Roberto Alsina on 2011-12-08

Don't step on platform, offer windows/console builds

76. By Roberto Alsina on 2011-12-09

Only copy bin files in prepare step, add binary for u1sdtool

77. By Roberto Alsina on 2011-12-14

Start windows-installer without privilege escalation

78. By Roberto Alsina on 2011-12-14

typo

79. By Roberto Alsina on 2011-12-14

bump to 2.0.3

80. By Roberto Alsina on 2011-12-28

Fix for LP:883675 [you may need to reboot]

81. By Roberto Alsina on 2012-01-02

make this configurable

82. By Roberto Alsina on 2012-01-02

merge the config'd branches

83. By Roberto Alsina on 2012-01-02

updated instructions

84. By Roberto Alsina on 2012-01-02

merged trunk

85. By Roberto Alsina on 2012-01-02

no glob, pep8 fixes

86. By Roberto Alsina on 2012-01-02

oops

87. By Roberto Alsina on 2012-01-02

typo

[Manuel de la Peña (mandel)]

Cool, We need to get this to lang, here are some comments:

* It looks to me that glob is not longer used, shall we remove the import.
* Regarding: os.system("bzr branch %s %s" % (urls[0], folder_name)) could we use Popen for that and find the location of the .exe via 'from distutils.spawn import find_executable'. That will also ensure that we can test if the system has bzr, if not we can give a meaningful error.
* In:
325 + # Remove "installed" copy
326 + try:
327 + shutil.rmtree(os.path.join("installed", "Lib"))
328 + except OSError:
329 + pass

Why do we ignore the exception?
* Within the source tree of ubuntuone-client there is a windows folder that contains an example loging.conf maybe we can simply copy it rather than doing:
401 + with open(logging_path, "rb") as f:
402 + data = f.read()
403 + data = data.replace("@LOG_LEVEL@", LOG_LEVEL)
404 + data = data.replace("@LOG_FILE_SIZE@", LOG_FILE_SIZE)
405 + with open(os.path.join("data", "logging.conf"), "wb") as f:
406 + f.write(data)
* Shall we put a poor mans name for:
449 + author='',
450 + author_email='',

review: Needs Fixing

[Roberto Alsina (ralsina)]

> Cool, We need to get this to lang, here are some comments:
>
> * It looks to me that glob is not longer used, shall we remove the import.

Agreed, removed.

> * Regarding: os.system("bzr branch %s %s" % (urls[0], folder_name)) could we
> use Popen for that and find the location of the .exe via 'from distutils.spawn
> import find_executable'. That will also ensure that we can test if the system
> has bzr, if not we can give a meaningful error.

Right now, if you don't have bzr, it fails with "'bzr' is not recognized as an internal or external command, operable program or batch file." which should be meaningful enough ;-)

I added error checking and made it abort on bzr errors now.

> * In:
> 325 + # Remove "installed" copy
> 326 + try:
> 327 + shutil.rmtree(os.path.join("installed", "Lib"))
> 328 + except OSError:
> 329 + pass
>
> Why do we ignore the exception?

Just in case it's not there.

> * Within the source tree of ubuntuone-client there is a windows folder that
> contains an example loging.conf maybe we can simply copy it rather than doing:
> 401 + with open(logging_path, "rb") as f:
> 402 + data = f.read()
> 403 + data = data.replace("@LOG_LEVEL@", LOG_LEVEL)
> 404 + data = data.replace("@LOG_FILE_SIZE@", LOG_FILE_SIZE)
> 405 + with open(os.path.join("data", "logging.conf"), "wb") as f:
> 406 + f.write(data)
> * Shall we put a poor mans name for:
> 449 + author='',
> 450 + author_email='',

This mimics the linux build's behaviour, to make those configurable.

[lp:~ralsina/ubuntuone-windows-installer/fix_809873]

88. By Roberto Alsina on 2012-01-04

remove traces of glob

89. By Roberto Alsina on 2012-01-04

handle bzr errors

90. By Roberto Alsina on 2012-01-05

unique app is merged in trunk

91. By Roberto Alsina on 2012-01-05

avoid system()

[Diego Sarmentero (diegosarmentero)]

Shouldn't this line be removed?:
139 + "lp:~ralsina/ubuntuone-windows-installer/register_plus_login"

Except for that, the rest looks ok!

review: Needs Information

[Roberto Alsina (ralsina)]

> Shouldn't this line be removed?:
> 139 + "lp:~ralsina/ubuntuone-windows-installer/register_plus_login"
>
>

Not yet! Without that hack, we don't produce a working release (the wizard will register users and leave them with invalid credentials)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Manuel de la Peña (mandel)]

We do the following a number of times: os.path.join("..", "..", "installed", "Lib", "site-packages", .. ) can we merge the common path and store it in a var?

review: Needs Fixing

[Roberto Alsina (ralsina)]

> We do the following a number of times: os.path.join("..", "..", "installed",
> "Lib", "site-packages", .. ) can we merge the common path and store it in a
> var?

Done!

[lp:~ralsina/ubuntuone-windows-installer/fix_809873]

92. By Roberto Alsina on 2012-01-09

remove redundancy

93. By Roberto Alsina on 2012-01-09

pep8 fix

94. By Roberto Alsina on 2012-01-09

lint fixes

95. By Roberto Alsina on 2012-01-09

lint

96. By Roberto Alsina on 2012-01-09

linux lint

[Manuel de la Peña (mandel)]

Code looks good.

review: Approve

=== added directory 'scripts'
=== added file 'scripts/README'
--- scripts/README	1970-01-01 00:00:00 +0000
+++ scripts/README	2012-01-09 14:40:29 +0000
@@ -0,0 +1,71 @@
+HOW TO BUILD A BUNDLE
+---------------------
+
+To build a bundle, assuming you have a windows developer setup, is as
+simple as:
+
+python setup.py fetch prepare py2exe
+
+The commands do the following:
+
+fetch
+
+	Use bzr to get trunk of ubuntu-sso-client, ubuntuone-client,
+	ubuntuone-control-panel and ubuntuone-windows-installer.
+
+	If you want to try building bundles with a branch that's not
+	merged to trunk yet, after you do "fetch" you can go to
+	sources\package-name and merge it there.
+
+prepare
+
+    Copies the "bins" out of the packages, does tweaks to the
+	source code, compiles .ui and .qrc files, and then
+	"installs" everything into the "installed" folder.
+
+py2exe
+
+	creates a dist folder with self-contained .exe files
+	using py2exe
+
+After you do this, you will have a fully self-contained set of binaries
+in the dist/ folder, which you can use for testing.
+
+HOW TO BUILD AN INSTALLER
+-------------------------
+
+Update the release numbers in setup.py ubuntuone_autoupdate.xml and 
+ubuntuone.xml. Remember that you have both a build (ex: 203) 
+and a release (ex: 2.0.3)
+
+Get the VS2008 runtime "vcredist_x86.exe" and put it in the
+scripts folder.
+
+Get the VistaLib32.dll and VistaLib64.dll and put them in dist. Those 
+DLLs are for allowing the wizard to run non-elevated, and came originally
+from here: http://www.codeproject.com/KB/vista-security/RunNonElevated.aspx
+
+According to their license, README_nonelevated.txt has to be distributed too.
+
+In order to build de installer you have to follow this stesp:
+
+    1. Customize the auto-updater:
+
+       The auto-updater is generated by the InstallBuilder product
+       in order to create a customized version (contains product name,
+       author etc...) please execute the following:
+
+       {$bitrock_installation$}\autoupdate\bin\customize.exe" build ubuntuone_autoupdate.xml windows
+
+       This command will create the updater which you have to copy to the scripts
+       folder in order to be able to create the installer.
+
+       It will probably be in ~\Documents\AutoUpdate\output (depends on the windows version)
+
+    2. Create the package:
+
+
+       {$bitrock_installation$}\bin\builder-cli.exe" build ubuntuone.xml
+
+       The resulting installer will be in ~\Documents\InstallBuilder\output 
+       (depends on the windows version)

=== added file 'scripts/README_nonelevated.txt'
--- scripts/README_nonelevated.txt	1970-01-01 00:00:00 +0000
+++ scripts/README_nonelevated.txt	2012-01-09 14:40:29 +0000
@@ -0,0 +1,21 @@
+THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
+PARTICULAR PURPOSE.
+
+Copyright (C) 2007.  WinAbility Software Corporation. All rights reserved.
+
+Author: Andrei Belogortseff [ http://www.winability.com ]
+
+TERMS OF USE: You are free to use this code in any way you like, 
+for both the commercial and non-commercial purposes, royalty-free,
+AS LONG AS you agree with the warranty disclaimer above, 
+EXCEPT that you may not remove or modify this or any of the 
+preceeding paragraphs. 
+
+If you use this code in your own project, an acknowledgement will be appreciated, 
+although it's not required.
+
+See the following article for the details:
+
+http://www.codeproject.com/useritems/RunNonElevated.asp

=== added file 'scripts/conf.py'
--- scripts/conf.py	1970-01-01 00:00:00 +0000
+++ scripts/conf.py	2012-01-09 14:40:29 +0000
@@ -0,0 +1,41 @@
+# conf.py - Configuration for Ubuntu One Client package windows build
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Configure what branches make the release."""
+
+# You can add branches that are to be merged into the release by
+# adding them to the adequate list.
+
+U1_CLIENT_BRANCHES = (
+    "lp:ubuntuone-client",
+)
+U1_CONTROL_PANEL_BRANCHES = (
+    "lp:ubuntuone-control-panel",
+)
+UBUNTU_SSO_BRANCHES = (
+    "lp:ubuntu-sso-client",
+)
+U1_WINDOWS_INSTALLER_BRANCHES = (
+    "lp:ubuntuone-windows-installer",
+    "lp:~ralsina/ubuntuone-windows-installer/register_plus_login"
+)
+U1_STORAGE_PROTOCOL_BRANCHES = (
+    "lp:ubuntuone-storage-protocol",
+)
+
+# If show_cmd is set to True, then the binaries will have cmd windows where
+# you can see stderr.
+
+SHOW_CMD = False

=== added directory 'scripts/customlang'
=== added file 'scripts/customlang/ubuntuone_en.lng'
--- scripts/customlang/ubuntuone_en.lng	1970-01-01 00:00:00 +0000
+++ scripts/customlang/ubuntuone_en.lng	2012-01-09 14:40:29 +0000
@@ -0,0 +1,1 @@
+Installer.Setup.Title=Installing Ubuntu One

=== added directory 'scripts/data'
=== added file 'scripts/setup.py'
--- scripts/setup.py	1970-01-01 00:00:00 +0000
+++ scripts/setup.py	2012-01-09 14:40:29 +0000
@@ -0,0 +1,360 @@
+#!/usr/bin/env python
+# setup-windows.py - Build system for Ubuntu One Client package
+#
+# Copyright 2010-2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""setup-windows.py"""
+
+import os
+import shutil
+import subprocess
+import sys
+
+from distutils import log
+from distutils.cmd import Command
+from distutils.core import setup
+
+import conf
+
+LOG_LEVEL = "DEBUG"
+LOG_FILE_SIZE = "1000000"
+
+
+# pylint is giving spurious reimport errors
+# pylint: disable=W0404
+# pylint is complaining about parent classes having too many methods
+# pylint: disable=R0904
+# pylint says "too many branches"
+# pylint: disable=R0912
+def get_py2exe_extension():
+    """Return an extension class of py2exe."""
+    # pylint: disable=F0401
+    from py2exe.build_exe import py2exe as build_exe
+    # pylint: enable=F0401
+
+    # pylint: disable=E1101
+    # pylint: disable=W0231
+    class MediaCollector(build_exe):
+        """Extension that copies lazr missing data."""
+
+        def __init__(self, *args, **kwargs):
+            """Create a new instance."""
+            build_exe.__init__(self, *args, **kwargs)
+
+        def _add_module_data(self, module_name):
+            """Add the data from a given path."""
+            # Create the media subdir where the
+            # Python files are collected.
+            media = module_name.replace('.', os.path.sep)
+            full = os.path.join(self.collect_dir, media)
+            if not os.path.exists(full):
+                self.mkpath(full)
+
+            # Copy the media files to the collection dir.
+            # Also add the copied file to the list of compiled
+            # files so it will be included in zipfile.
+            module = __import__(module_name, None, None, [''])
+            for path in module.__path__:
+                for file_name in os.listdir(path):
+                    file_name = os.path.join(path, file_name)
+                    log.info('Copying file %s', file_name)
+                    name = os.path.basename(file_name)
+                    if not os.path.isdir(file_name):
+                        self.copy_file(file_name, os.path.join(full, name))
+                        self.compiled_files.append(os.path.join(media, name))
+                    else:
+                        self.copy_tree(file_name, os.path.join(full, name))
+
+        def copy_extensions(self, extensions):
+            """Copy the missing extensions."""
+            build_exe.copy_extensions(self, extensions)
+            for module in [
+                'lazr.uri',
+                'lazr.restfulclient',
+                'lazr.authentication',
+                'wadllib',
+                'ubuntuone.storageprotocol',
+                ]:
+                self._add_module_data(module)
+
+    # ModuleFinder can't handle runtime changes to __path__,
+    # but win32com uses them
+    try:
+        # py2exe 0.6.4 introduced a replacement modulefinder.
+        # This means we have to add package paths there, not to the built-in
+        # one.  If this new modulefinder gets integrated into Python, then
+        # we might be able to revert this some day.
+        # if this doesn't work, try import modulefinder
+        # pylint: disable=F0401
+        try:
+            import py2exe.mf as modulefinder
+        except ImportError:
+            import modulefinder
+        import win32com
+        # pylint: enable=F0401
+        for path in win32com.__path__[1:]:
+            modulefinder.AddPackagePath("win32com", path)
+        for extra in ["win32com.shell"]:  # ,"win32com.mapi"
+            __import__(extra)
+            modules = sys.modules[extra]
+            for path in modules.__path__[1:]:
+                modulefinder.AddPackagePath(extra, path)
+    except ImportError:
+        # no build path setup, no worries.
+        pass
+    # pylint: enable=E1101
+    return MediaCollector
+# pylint: enable=W0404
+# pylint: enable=R0904
+# pylint: enable=R0912
+
+
+def branch_and_merge(urls):
+    """Branch and merge all requested branches."""
+    project_name = urls[0].split(":")[1]
+    print "Getting sources for:", project_name
+    folder_name = os.path.join("sources", project_name)
+    current_folder = os.getcwd()
+    if os.path.isdir(folder_name):  # Folder exists
+        shutil.rmtree(folder_name)
+    subprocess.check_call(["bzr", "branch", urls[0], folder_name])
+    os.chdir(folder_name)
+    for url in urls[1:]:
+        print "Merging:", url
+        subprocess.check_call(["bzr", "merge", url])
+        subprocess.check_call(["bzr", "commit", "-m", '"merged %s"' % url])
+    os.chdir(current_folder)
+
+
+# pylint is complaining about parent classes having too many methods
+# pylint: disable=R0904
+class FetchSources(Command):
+
+    """Branch or pull the sources from all packages."""
+
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        """Perform the command."""
+        # Checkout sources
+        for folder in ["sources", "bin", "installed", "data"]:
+            if not os.path.isdir(folder):
+                os.mkdir(folder)
+        branch_and_merge(conf.U1_CLIENT_BRANCHES)
+        branch_and_merge(conf.U1_CONTROL_PANEL_BRANCHES)
+        branch_and_merge(conf.UBUNTU_SSO_BRANCHES)
+        branch_and_merge(conf.U1_WINDOWS_INSTALLER_BRANCHES)
+        branch_and_merge(conf.U1_STORAGE_PROTOCOL_BRANCHES)
+# pylint: enable=R0904
+
+
+# pylint is complaining about parent classes having too many methods
+# pylint: disable=R0904
+class PrepareSources(Command):
+
+    """Manipulate the sources look as if they were installed."""
+
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        """Perform the command."""
+        # Take binaries
+        shutil.copyfile(os.path.join(
+            "sources", "ubuntuone-client", "bin", "ubuntuone-syncdaemon"),
+            os.path.join("bin", "ubuntuone-syncdaemon"))
+        shutil.copyfile(os.path.join(
+            "sources", "ubuntuone-client", "bin", "u1sdtool"),
+            os.path.join("bin", "u1sdtool"))
+        shutil.copyfile(os.path.join("sources", "ubuntu-sso-client",
+            "bin", "ubuntu-sso-login"),
+            os.path.join("bin", "ubuntu-sso-login"))
+        shutil.copyfile(os.path.join("sources",
+            "ubuntuone-control-panel", "bin",
+            "ubuntuone-control-panel-qt"),
+            os.path.join("bin", "ubuntuone-control-panel-qt"))
+        shutil.copyfile(os.path.join("sources", "ubuntuone-windows-installer",
+            "bin", "ubuntuone-installer-qt"),
+            os.path.join("bin", "ubuntuone-installer-qt"))
+
+        # Remove "installed" copy
+        try:
+            shutil.rmtree(os.path.join("installed", "Lib"))
+        except OSError:
+            pass
+
+        # Build UI files, copy packages.
+        dest_dir = os.path.join(
+            "..", "..", "installed", "Lib", "site-packages", "ubuntu_sso")
+        start_dir = os.getcwd()
+        os.chdir(os.path.join("sources", "ubuntu-sso-client"))
+        os.system("python setup.py build")
+        os.system("python setup.py install --prefix=%s" %
+            os.path.join("..", "..", "installed"))
+        shutil.copytree("ubuntu_sso", dest_dir)
+        sso_revno = subprocess.Popen(
+            ["bzr", "revno", "."],
+            stdout=subprocess.PIPE).communicate()[0]
+        os.chdir(start_dir)
+
+        os.chdir(os.path.join("sources", "ubuntuone-client"))
+        shutil.copy(os.path.join("windows", "clientdefs.py"),
+            os.path.join("ubuntuone", "clientdefs.py"))
+        shutil.copytree("ubuntuone", dest_dir)
+        u1client_revno = subprocess.Popen(
+            ["bzr", "revno", "."],
+            stdout=subprocess.PIPE).communicate()[0]
+        os.chdir(start_dir)
+
+        os.chdir(os.path.join("sources", "ubuntuone-control-panel"))
+        os.system("python setup.py build")
+        # Copying by hand because the install is borked
+        shutil.copytree(os.path.join("ubuntuone", "controlpanel"),
+            dest_dir)
+        u1cp_revno = subprocess.Popen(
+            ["bzr", "revno", "."],
+            stdout=subprocess.PIPE).communicate()[0]
+        os.chdir(start_dir)
+
+        os.chdir(os.path.join("sources", "ubuntuone-windows-installer"))
+        os.system("python setup.py build")
+        # Copying by hand because the install is borked
+        shutil.copytree("ubuntuone_installer", dest_dir)
+        u1inst_revno = subprocess.Popen(
+            ["bzr", "revno", "."],
+            stdout=subprocess.PIPE).communicate()[0]
+        os.chdir(start_dir)
+
+        # Create revno file
+        with open(os.path.join("data", "revnos.txt"), "w+") as revnos:
+            revnos.write("ubuntu-sso-client: %s"
+                    "ubuntuone-client: %s"
+                    "ubuntuone-control-panel: %s"
+                    "ubuntuonw-windows-installer: %s" %
+                    (sso_revno, u1client_revno, u1cp_revno, u1inst_revno))
+
+        # Copy storage-protocol's pem files
+        shutil.copyfile(os.path.join("sources",
+            "ubuntuone-storage-protocol", "data",
+            "UbuntuOne-Go_Daddy_CA.pem"),
+            os.path.join("data", "UbuntuOne-Go_Daddy_CA.pem"))
+        shutil.copyfile(os.path.join("sources",
+            "ubuntuone-storage-protocol", "data",
+            "UbuntuOne-Go_Daddy_Class_2_CA.pem"),
+            os.path.join("data", "UbuntuOne-Go_Daddy_Class_2_CA.pem"))
+
+        # Copy syncdaemon config data
+        shutil.copyfile(os.path.join("sources",
+            "ubuntuone-client", "data",
+            "syncdaemon.conf"),
+            os.path.join("data", "syncdaemon.conf"))
+        logging_path = os.path.join("sources",
+            "ubuntuone-client", "data",
+            "logging.conf.in")
+        with open(logging_path, "rb") as logconf:
+            data = logconf.read()
+        data = data.replace("@LOG_LEVEL@", LOG_LEVEL)
+        data = data.replace("@LOG_FILE_SIZE@", LOG_FILE_SIZE)
+        with open(os.path.join("data", "logging.conf"), "wb") as logconf:
+            logconf.write(data)
+# pylint: enable=R0904
+
+
+if __name__ == "__main__":
+
+    # pylint: disable=C0103
+    # Add the installed copy to the PYTHONPATH
+    sys.path.insert(0, os.path.join("installed", "Lib", "site-packages"))
+
+    console = [
+        {
+            'script': 'bin/u1sdtool',
+        },
+    ]
+
+    windows = [
+        {
+            'script': 'bin/ubuntuone-syncdaemon',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+        {
+            'script': 'bin/ubuntuone-control-panel-qt',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+        {
+            'script': 'bin/ubuntu-sso-login',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+        {
+            'script': 'bin/ubuntuone-installer-qt',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+    ]
+
+    if conf.SHOW_CMD == True:
+        console.extend(windows)
+        windows = []
+
+    # Build bundles
+    setup(
+        name='ubuntuone',
+        version='2.0.3',
+        license='GPL v3',
+        author='',
+        author_email='',
+        description='Ubuntu One',
+        url='https://one.ubuntu.com',
+        cmdclass={
+            'py2exe': get_py2exe_extension(),
+            'fetch': FetchSources,
+            'prepare': PrepareSources,
+        },
+        console=console,
+        windows=windows,
+        options={
+            'py2exe': {
+                'includes': ['google.protobuf.descriptor',
+                    'sip',
+                    'twisted.web.resource',
+                    'ubuntu_sso.qt',
+                    'ubuntu_sso.qt.gui',
+                    'PyQt4.QtNetwork',
+                    'oauth',
+                    'ubuntuone_installer',
+                    'configglue',
+                    'configglue.app',
+                    'configglue.inischema',
+                    'configglue.pyschema.glue',
+                    'configglue.inischema.glue',
+                    'configglue.inischema.parsers',
+                    ],
+                'excludes': ['fsm'],
+                "dll_excludes": [
+                    "MSVCP90.dll",
+                    "MSWSOCK.dll",
+                    "mswsock.dll",
+                    "powrprof.dll",
+                    ],
+            }})

=== added file 'scripts/ubuntu_one.ico'
Binary files scripts/ubuntu_one.ico	1970-01-01 00:00:00 +0000 and scripts/ubuntu_one.ico	2012-01-09 14:40:29 +0000 differ
=== added file 'scripts/ubuntuone.xml'
--- scripts/ubuntuone.xml	1970-01-01 00:00:00 +0000
+++ scripts/ubuntuone.xml	2012-01-09 14:40:29 +0000
@@ -0,0 +1,396 @@
+<project>
+    <shortName>ubuntuone</shortName>
+    <fullName>Ubuntu One</fullName>
+    <version>2.0.3</version>
+    <componentList>
+        <component>
+            <name>autoupdater</name>
+            <description>Includes tool to perform updates</description>
+            <canBeEdited>0</canBeEdited>
+            <selected>1</selected>
+            <show>0</show>
+            <folderList>
+                <folder>
+                    <destination>${installdir}</destination>
+                    <name>autoupdaterwin</name>
+                    <platforms>windows</platforms>
+                    <distributionFileList>
+                        <distributionFile origin="autoupdate-windows.exe"/>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+            <postInstallationActionList>
+                <writeFile>
+                    <path>${installdir}/update.ini</path>
+                    <text>[Update]
+url = http://one.ubuntu.com/windows/update.xml
+version_id = 203
+check_for_updates = 1
+</text>
+                </writeFile>
+            </postInstallationActionList>
+        </component>
+        <component>
+            <name>default</name>
+            <description>Default Component</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <desktopShortcutList>
+                <shortcut>
+                    <comment></comment>
+                    <exec></exec>
+                    <icon></icon>
+                    <name>Ubuntu One</name>
+                    <path></path>
+                    <platforms>windows</platforms>
+                    <runAsAdmin>0</runAsAdmin>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${installdir}\dist\ubuntuone-installer-qt.exe</windowsExec>
+                    <windowsExecArgs></windowsExecArgs>
+                    <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
+                    <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
+                </shortcut>
+            </desktopShortcutList>
+            <folderList>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfiles</name>
+                    <platforms>all</platforms>
+                    <shortcutList>
+                        <shortcut>
+                            <comment>Uninstall</comment>
+                            <exec>${installdir}/${uninstallerName}</exec>
+                            <icon></icon>
+                            <name>Uninstall ${product_fullname}</name>
+                            <path>${installdir}</path>
+                            <platforms>all</platforms>
+                            <runAsAdmin>1</runAsAdmin>
+                            <runInTerminal>0</runInTerminal>
+                            <windowsExec>${installdir}/${uninstallerName}.exe --mode win32</windowsExec>
+                            <windowsExecArgs></windowsExecArgs>
+                            <windowsIcon></windowsIcon>
+                            <windowsPath>${installdir}</windowsPath>
+                        </shortcut>
+                    </shortcutList>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfileslinux</name>
+                    <platforms>linux</platforms>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfileswindows</name>
+                    <platforms>windows</platforms>
+                    <distributionFileList>
+                        <distributionDirectory>
+                            <origin>dist</origin>
+                        </distributionDirectory>
+                        <distributionDirectory>
+                            <origin>data</origin>
+                        </distributionDirectory>
+                        <distributionFile>
+                            <origin>vcredist_x86.exe</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>ubuntu_one.ico</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfilesosx</name>
+                    <platforms>osx</platforms>
+                </folder>
+            </folderList>
+            <preInstallationActionList>
+                <actionGroup>
+                    <actionList>
+                        <setInstallerVariable name="installationType" value="upgrade"/>
+                    </actionList>
+
+	<!-- We assume an existing installation if ${installdir}/uninstall.exe exists -->
+	<ruleList>
+                        <fileTest condition="exists" path="${installdir}/uninstall.exe"/>
+                    </ruleList>
+                </actionGroup>
+            </preInstallationActionList>
+            <startMenuShortcutList>
+                <startMenuShortcut>
+                    <comment>Uninstall ${product_fullname}</comment>
+                    <name>Uninstall ${product_fullname}</name>
+                    <runAsAdmin>0</runAsAdmin>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
+                    <windowsExecArgs>--mode win32</windowsExecArgs>
+                    <windowsIcon></windowsIcon>
+                    <windowsPath>${installdir}/</windowsPath>
+                </startMenuShortcut>
+                <startMenuShortcut>
+                    <comment>Ubuntu One</comment>
+                    <name>Ubuntu One</name>
+                    <runAsAdmin>0</runAsAdmin>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${installdir}\dist\ubuntuone-installer-qt.exe</windowsExec>
+                    <windowsExecArgs></windowsExecArgs>
+                    <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
+                    <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
+                </startMenuShortcut>
+                <startMenuFileShortcut>
+                    <comment></comment>
+                    <filePath>${windows_folder_profile}\Ubuntu One</filePath>
+                    <name>Ubuntu One Folder</name>
+                    <runAsAdmin>0</runAsAdmin>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsIcon></windowsIcon>
+                </startMenuFileShortcut>
+            </startMenuShortcutList>
+        </component>
+        <component>
+            <name>vcruntime</name>
+            <canBeEdited>1</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <destination>${installdir}</destination>
+                    <name>vcfiles</name>
+                    <platforms>all</platforms>
+                    <actionList>
+                        <runProgram>
+                            <abortOnError>0</abortOnError>
+                            <program>${installdir}/vcredist_x86.exe</program>
+                            <programArguments>/q
+</programArguments>
+                            <progressText>Installing C++ runtime</progressText>
+                            <showMessageOnError>0</showMessageOnError>
+                        </runProgram>
+                    </actionList>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>vcredist_x86.exe</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+        </component>
+    </componentList>
+    <initializationActionList>
+        <setInstallerVariable name="msiexec" value=""/>
+        <setInstallerVariable name="msiexec" persist="1" value="msiexec.exe">
+            <ruleList>
+                <programTest condition="is_in_path" name="msiexec.exe"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="msiexec" persist="1" value="${windows_dir}/system32/msiexec.exe">
+            <ruleList>
+                <fileTest condition="exists" path="${windows_dir}/system32/msiexec.exe"/>
+                <compareText logic="equals" text="${msiexec}" value=""/>
+            </ruleList>
+        </setInstallerVariable>
+        <actionGroup>
+            <actionList>
+                <getWindowsFileVersionInfo path="${msiexec}" type="version" variable="msi_version"/>
+                <setInstallerVariableFromRegEx name="msi_version" pattern="(^[0-9]+)\.([0-9]+)\..*" substitution="\1.\2" text="${msi_version}"/>
+            </actionList>
+            <ruleList>
+                <compareText logic="does_not_equal" text="${msiexec}" value=""/>
+            </ruleList>
+        </actionGroup>
+        <throwError>
+            <ruleEvaluationLogic>or</ruleEvaluationLogic>
+            <text>
+You need at least Windows Installer MSI version 3.1.
+</text>
+            <ruleList>
+                <compareText logic="equals" text="${msiexec}" value=""/>
+                <compareValues logic="less" value1="${msi_version}" value2="3.1"/>
+            </ruleList>
+        </throwError>
+    </initializationActionList>
+    <postInstallationActionList>
+        <registrySet>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\${project.fullName}\</key>
+            <name>path-ubuntuone-syncdaemon</name>
+            <type>REG_SZ</type>
+            <value>${installdir}\dist\ubuntuone-syncdaemon.exe</value>
+        </registrySet>
+        <registrySet>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\${project.fullName}\</key>
+            <name>path-ubuntu-sso-client</name>
+            <type>REG_SZ</type>
+            <value>${installdir}\dist\ubuntu-sso-login.exe</value>
+        </registrySet>
+        <runProgram>
+            <program>${windows_folder_system}\RunDll32.exe</program>
+            <programArguments>"${installdir}\dist\VistaLib32.dll" RunNonElevated "${installdir}\dist\ubuntuone-installer-qt.exe" --installer &amp;</programArguments>
+            <useMSDOSPath>0</useMSDOSPath>
+            <ruleList>
+                <compareText>
+                    <logic>does_not_equal</logic>
+                    <text>${installationType}</text>
+                    <value>upgrade</value>
+                </compareText>
+                <platformTest>
+                    <type>windows-x86</type>
+                </platformTest>
+            </ruleList>
+        </runProgram>
+        <runProgram>
+            <program>${windows_folder_system}\RunDll32.exe</program>
+            <programArguments>"${installdir}\dist\VistaLib64.dll" RunNonElevated "${installdir}\dist\ubuntuone-installer-qt.exe" --installer &amp;</programArguments>
+            <useMSDOSPath>0</useMSDOSPath>
+            <ruleList>
+                <compareText>
+                    <logic>does_not_equal</logic>
+                    <text>${installationType}</text>
+                    <value>upgrade</value>
+                </compareText>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </runProgram>
+        <showInfo>
+            <text>Please reboot to finish upgrade.</text>
+            <ruleList>
+                <compareText>
+                    <logic>equals</logic>
+                    <text>${installationType}</text>
+                    <value>upgrade</value>
+                </compareText>
+            </ruleList>
+        </showInfo>
+        <createDirectory>
+            <path>${windows_folder_common_appdata}\ubuntuone</path>
+        </createDirectory>
+        <createDirectory>
+            <path>${windows_folder_common_appdata}\ubuntuone-storageprotocol</path>
+        </createDirectory>
+        <copyFile>
+            <destination>${windows_folder_common_appdata}\ubuntuone</destination>
+            <origin>${installdir}\data\syncdaemon.conf</origin>
+        </copyFile>
+        <copyFile>
+            <destination>${windows_folder_common_appdata}\ubuntuone</destination>
+            <origin>${installdir}\data\logging.conf</origin>
+        </copyFile>
+        <copyFile>
+            <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
+            <origin>${installdir}\data\UbuntuOne-Go_Daddy_CA.pem</origin>
+        </copyFile>
+        <copyFile>
+            <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
+            <origin>${installdir}\data\UbuntuOne-Go_Daddy_Class_2_CA.pem</origin>
+        </copyFile>
+        <deleteFile>
+            <path>c:\install.exe</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.1028.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.1031.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.1033.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.1036.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.1040.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.1041.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.1042.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.2052.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.res.3082.dll</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\vcredist.bmp</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\globdata.ini</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\install.ini</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.1028.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.1031.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.1033.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.1036.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.1040.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.1041.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.1042.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.2052.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\eula.3082.txt</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\vc_red.msi</path>
+        </deleteFile>
+        <deleteFile>
+            <path>c:\vc_red.cab</path>
+        </deleteFile>
+    </postInstallationActionList>
+    <compressionAlgorithm>lzma</compressionAlgorithm>
+    <defaultInstallationMode>unattended</defaultInstallationMode>
+    <disableSplashScreen>1</disableSplashScreen>
+    <enableRollback>1</enableRollback>
+    <enableTimestamp>1</enableTimestamp>
+    <installationLogFile>${installdir}/install.log</installationLogFile>
+    <saveRelativePaths>1</saveRelativePaths>
+    <unattendedModeUI>minimal</unattendedModeUI>
+    <vendor>Canonical</vendor>
+    <windowsSoftwareRegistryPrefix>${product_fullname}</windowsSoftwareRegistryPrefix>
+    <customLanguageFileList>
+        <language>
+            <code>en</code>
+            <file>customlang/ubuntuone_en.lng</file>
+        </language>
+    </customLanguageFileList>
+    <parameterList>
+        <directoryParameter>
+            <name>installdir</name>
+            <description>Installer.Parameter.installdir.description</description>
+            <explanation>Installer.Parameter.installdir.explanation</explanation>
+            <value></value>
+            <default>${platform_install_prefix}/${product_shortname}</default>
+            <allowEmptyValue>0</allowEmptyValue>
+            <ask>0</ask>
+            <cliOptionName>prefix</cliOptionName>
+            <mustBeWritable>1</mustBeWritable>
+            <mustExist>0</mustExist>
+            <width>40</width>
+        </directoryParameter>
+    </parameterList>
+</project>
+

=== added file 'scripts/ubuntuone_autoupdate.xml'
--- scripts/ubuntuone_autoupdate.xml	1970-01-01 00:00:00 +0000
+++ scripts/ubuntuone_autoupdate.xml	2012-01-09 14:40:29 +0000
@@ -0,0 +1,9 @@
+<autoUpdateProject>
+    <fullName>Ubuntu One</fullName>
+    <shortName>ubuntuone</shortName>
+    <vendor>Canonical</vendor>
+    <version>203</version>
+    <singleInstanceCheck>1</singleInstanceCheck>
+    <requireInstallationByRootUser>0</requireInstallationByRootUser>
+    <requestedExecutionLevel>asInvoker</requestedExecutionLevel>
+</autoUpdateProject>

=== modified file 'ubuntuone_installer/gui/qt/sync_now_or_later.py'
--- ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-09-09 14:33:19 +0000
+++ ubuntuone_installer/gui/qt/sync_now_or_later.py	2012-01-09 14:40:29 +0000
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #