Merge lp:~nataliabidart/ubuntuone-windows-installer/stable-3-0-update-2.99.2 into lp:ubuntuone-windows-installer/stable-3-0

[Natalia Bidart]

[ Roberto Alsina <email address hidden> ]
  - Add a scripts folder containing the bundle-making script and the bitrock
    installer project (LP: #885247).
[ Diego Sarmentero <email address hidden> ]
  - Agree button modified to look as a default button (LP: #910950).

[Roberto Alsina (ralsina)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== added directory 'scripts'
=== added file 'scripts/README'
--- scripts/README	1970-01-01 00:00:00 +0000
+++ scripts/README	2012-01-17 16:56:24 +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-17 16:56:24 +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-17 16:56:24 +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-17 16:56:24 +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-17 16:56:24 +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-17 16:56:24 +0000 differ
=== added file 'scripts/ubuntuone.xml'
--- scripts/ubuntuone.xml	1970-01-01 00:00:00 +0000
+++ scripts/ubuntuone.xml	2012-01-17 16:56:24 +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-17 16:56:24 +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/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-12-13 12:40:25 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2012-01-17 16:56:24 +0000
@@ -91,8 +91,8 @@
 SUCCESSFUL_LOGIN = _("Login successful")
 TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>"
 UPDATE_TITLE = _("Updates are available")
-UPDATE_SOFTWARE = _("There is a new version available. "
-                    "Do you want perform an upgrade?")
+UPDATE_SOFTWARE = _("There is a new version of Ubuntu One available. "
+                    "Do you want to perform an upgrade?")
 REMOVE_OLD_BETA_TITLE = _("Remove old Beta")
 REMOVE_OLD_BETA = _("The old Ubuntu One Beta is installed in your system. Do "
                     "you want to uninstall it?")
@@ -155,6 +155,7 @@
         super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)
         self.header.setVisible(False)
         self.ui.textBrowser.setHtml(qt.LICENSE_CONTENT)
+        self.agree_button = None
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -181,6 +182,11 @@
             QtGui.QWizard.NextButton,
             QtGui.QWizard.FinishButton])
 
+        self.agree_button = self.wizard().button(QtGui.QWizard.NextButton)
+        self.agree_button.setDefault(True)
+        self.agree_button.style().unpolish(self.agree_button)
+        self.agree_button.style().polish(self.agree_button)
+
     def nextId(self):
         """Return next page's ID."""
         if self._next_id is None:

=== 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-17 16:56:24 +0000
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #

=== modified file 'ubuntuone_installer/gui/qt/tests/__init__.py'
--- ubuntuone_installer/gui/qt/tests/__init__.py	2011-11-10 13:57:33 +0000
+++ ubuntuone_installer/gui/qt/tests/__init__.py	2012-01-17 16:56:24 +0000
@@ -175,6 +175,39 @@
         return self.buttons.setdefault(button_id, QtGui.QPushButton())
 
 
+class FakeWizardButtonStyle(FakeWizard):
+
+    def __init__(self):
+        super(FakeWizardButtonStyle, self).__init__()
+        self.data = {}
+
+    # pylint: disable=C0103
+    def setDefault(self, value):
+        """Fake setDefault for button."""
+        self.data['default'] = value
+
+    def isDefault(self):
+        """Fake isDefault."""
+        return self.data['default']
+    # pylint: enable=C0103
+
+    def button(self, button_id):
+        """Fake the functionality of button on QWizard class."""
+        return self
+
+    def style(self):
+        """Fake button style."""
+        return self
+
+    def polish(self, button):
+        """Fake polish."""
+        self.data['polish'] = button
+
+    def unpolish(self, button):
+        """Fake unpolish."""
+        self.data['unpolish'] = button
+
+
 class FakeWizardPage(object):
 
     """A fake wizard page."""

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-12-13 16:16:56 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2012-01-17 16:56:24 +0000
@@ -39,6 +39,7 @@
     FakeController,
     FakeOverlay,
     FakeSignal,
+    FakeWizardButtonStyle,
     FakeWizardPage,
     NO_OP,
 )
@@ -224,7 +225,24 @@
         self.assertFalse(setup_page.set_up_button.isVisible())
         self.assertTrue(setup_page.set_up_button.isDefault())
 
-    def test_execute_uninstall_on_licence_cancel(self):
+    def test_license_page_agree_button_style(self):
+        """Check that License Page shows agree button with the proper style."""
+        license_page = self.ui.page(self.ui.LICENSE_PAGE)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.patch(license_page, "wizard", FakeWizardButtonStyle)
+        license_page.initializePage()
+        self.assertTrue(license_page.agree_button.isDefault())
+        self.assertTrue('polish' in license_page.agree_button.data)
+        self.assertTrue('unpolish' in license_page.agree_button.data)
+        self.assertEqual(license_page.agree_button.data['polish'],
+            license_page.agree_button)
+        self.assertEqual(license_page.agree_button.data['unpolish'],
+            license_page.agree_button)
+
+    def test_execute_uninstall_on_license_cancel(self):
         """Pressing Disagree button from license page the uninstall is exec."""
         self.ui.setStartId(self.ui.LICENSE_PAGE)
         self.ui.restart()
@@ -235,7 +253,7 @@
         self.ui.done(result=0)
         self.assertTrue(self._called)
 
-    def test_execute_uninstall_on_licence_cancel_frozen(self):
+    def test_execute_uninstall_on_license_cancel_frozen(self):
         """Pressing Disagree button from license page the uninstall is exec."""
         self.ui.setStartId(self.ui.LICENSE_PAGE)
         self.ui.restart()