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

[Roberto Alsina]

Cleanup windows build, get rid of windows-installer, build all required binaries.

Cleanup windows build, get rid of windows-installer, build all required binaries.

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

116. By Roberto Alsina on 2012-03-23

no manual branches, fixed version number

117. By Roberto Alsina on 2012-03-23

missing ampersand

118. By Roberto Alsina on 2012-03-23

missing argument

119. By Roberto Alsina on 2012-03-23

abandon the idea of release number and version being similar

[Brian Curtin (brian.curtin)]

+1 - looks fine, worked well IRL when I used it a few minutes ago

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'scripts/README'
--- scripts/README	2012-01-04 12:43:39 +0000
+++ scripts/README	2012-03-23 18:38:19 +0000
@@ -35,8 +35,9 @@
 -------------------------
 
 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)
+ubuntuone.xml. Remember that you have both a build (ex: 1000) 
+and a release (ex: 2.0.3). The build number in ubuntuone_autoupdate.xml should
+be increased on all releases and is not related to the version number.
 
 Get the VS2008 runtime "vcredist_x86.exe" and put it in the
 scripts folder.
 
=== modified file 'scripts/conf.py'
--- scripts/conf.py	2012-03-16 14:19:31 +0000
+++ scripts/conf.py	2012-03-23 18:38:19 +0000
@@ -13,28 +13,31 @@
 #
 # 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."""
 
+# This is appended to the branches. So, if you set it to
+# "/stable-3-0" you will get lp:ubuntuone-client/stable-3-0
+BRANCH_POSTFIX = ""
+
 # 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",
+    "lp:ubuntuone-client" + BRANCH_POSTFIX,
 )
 U1_CONTROL_PANEL_BRANCHES = (
-    "lp:ubuntuone-control-panel",
+    "lp:ubuntuone-control-panel" + BRANCH_POSTFIX,
 )
 UBUNTU_SSO_BRANCHES = (
-    "lp:ubuntu-sso-client",
-)
-U1_WINDOWS_INSTALLER_BRANCHES = (
-    "lp:ubuntuone-windows-installer",
+    "lp:ubuntu-sso-client" + BRANCH_POSTFIX,
 )
 U1_STORAGE_PROTOCOL_BRANCHES = (
-    "lp:ubuntuone-storage-protocol",
+    "lp:ubuntuone-storage-protocol" + BRANCH_POSTFIX,
 )
 
 # If show_cmd is set to True, then the binaries will have cmd windows where
 # you can see stderr.
 
-SHOW_CMD = False
+SHOW_CMD = True
 
=== modified file 'scripts/setup.py'
--- scripts/setup.py	2012-03-16 14:39:17 +0000
+++ scripts/setup.py	2012-03-23 18:38:19 +0000
@@ -160,7 +160,6 @@
         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
 
@@ -188,16 +187,25 @@
         shutil.copyfile(os.path.join(
             "sources", "ubuntuone-client", "bin", "u1sdtool"),
             os.path.join("bin", "u1sdtool"))
+        shutil.copyfile(os.path.join(
+            "sources", "ubuntuone-client", "bin", "ubuntuone-proxy-tunnel"),
+            os.path.join("bin", "ubuntuone-proxy-tunnel"))
         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", "ubuntu-sso-client",
+            "bin", "ubuntu-sso-login-qt"),
+            os.path.join("bin", "ubuntu-sso-login-qt"))
+        shutil.copyfile(os.path.join("sources", "ubuntu-sso-client",
+            "bin", "ubuntu-sso-proxy-creds-qt"),
+            os.path.join("bin", "ubuntu-sso-proxy-creds-qt"))
+        shutil.copyfile(os.path.join("sources", "ubuntu-sso-client",
+            "bin", "ubuntu-sso-ssl-certificate-qt"),
+            os.path.join("bin", "ubuntu-sso-ssl-certificate-qt"))
         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:
@@ -241,23 +249,12 @@
             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
-        dest_installer = os.path.join(dest_dir, "ubuntuone_installer")
-        shutil.copytree("ubuntuone_installer", dest_installer)
-        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))
+                    "ubuntuone-control-panel: %s" %
+                    (sso_revno, u1client_revno, u1cp_revno))
 
         # Copy storage-protocol's pem files
         shutil.copyfile(os.path.join("sources",
@@ -304,6 +301,10 @@
             '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')]
         },
@@ -312,7 +313,15 @@
             'icon_resources': [(0, 'ubuntu_one.ico')]
         },
         {
-            'script': 'bin/ubuntuone-installer-qt',
+            'script': 'bin/ubuntu-sso-login-qt',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+        {
+            'script': 'bin/ubuntu-sso-proxy-creds-qt',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+        {
+            'script': 'bin/ubuntu-sso-ssl-certificate-qt',
             'icon_resources': [(0, 'ubuntu_one.ico')]
         },
     ]
@@ -324,7 +333,7 @@
     # Build bundles
     setup(
         name='ubuntuone',
-        version='2.0.3',
+        version='2.99.91',
         license='GPL v3',
         author='',
         author_email='',
@@ -342,11 +351,11 @@
                 'includes': ['google.protobuf.descriptor',
                     'sip',
                     'twisted.web.resource',
+                    'twisted.web.client',
                     'ubuntu_sso.qt',
-                    'ubuntu_sso.qt.gui',
+                    'ubuntu_sso.qt.ui',
                     'PyQt4.QtNetwork',
                     'oauth',
-                    'ubuntuone_installer',
                     'configglue',
                     'configglue.app',
                     'configglue.inischema',
 
=== modified file 'scripts/ubuntuone.xml'
--- scripts/ubuntuone.xml	2011-12-28 19:15:16 +0000
+++ scripts/ubuntuone.xml	2012-03-23 18:38:19 +0000
@@ -1,7 +1,7 @@
 <project>
     <shortName>ubuntuone</shortName>
     <fullName>Ubuntu One</fullName>
-    <version>2.0.3</version>
+    <version>2.99.91</version>
     <componentList>
         <component>
             <name>autoupdater</name>
@@ -46,8 +46,7 @@
                     <platforms>windows</platforms>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
-                    <windowsExec>${installdir}\dist\ubuntuone-installer-qt.exe</windowsExec>
-                    <windowsExecArgs></windowsExecArgs>
+                    <windowsExec>${installdir}\dist\ubuntuone-control-panel-qt.exe</windowsExec>
                     <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
                     <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
                 </shortcut>
@@ -136,7 +135,7 @@
                     <name>Ubuntu One</name>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
-                    <windowsExec>${installdir}\dist\ubuntuone-installer-qt.exe</windowsExec>
+                    <windowsExec>${installdir}\dist\ubuntuone-control-panel-qt.exe</windowsExec>
                     <windowsExecArgs></windowsExecArgs>
                     <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
                     <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
@@ -228,7 +227,7 @@
         </registrySet>
         <runProgram>
             <program>${windows_folder_system}\RunDll32.exe</program>
-            <programArguments>"${installdir}\dist\VistaLib32.dll" RunNonElevated "${installdir}\dist\ubuntuone-installer-qt.exe" --installer &amp;</programArguments>
+            <programArguments>"${installdir}\dist\VistaLib32.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe --installer &amp;"</programArguments>
             <useMSDOSPath>0</useMSDOSPath>
             <ruleList>
                 <compareText>
@@ -243,7 +242,7 @@
         </runProgram>
         <runProgram>
             <program>${windows_folder_system}\RunDll32.exe</program>
-            <programArguments>"${installdir}\dist\VistaLib64.dll" RunNonElevated "${installdir}\dist\ubuntuone-installer-qt.exe" --installer &amp;</programArguments>
+            <programArguments>"${installdir}\dist\VistaLib64.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe" --installer &amp;</programArguments>
             <useMSDOSPath>0</useMSDOSPath>
             <ruleList>
                 <compareText>
@@ -256,6 +255,7 @@
                 </platformTest>
             </ruleList>
         </runProgram>
+        <!-- TODO: remove this showInfo? -->
         <showInfo>
             <text>Please reboot to finish upgrade.</text>
             <ruleList>
 
=== modified file 'scripts/ubuntuone_autoupdate.xml'
--- scripts/ubuntuone_autoupdate.xml	2011-12-14 20:42:38 +0000
+++ scripts/ubuntuone_autoupdate.xml	2012-03-23 18:38:19 +0000
@@ -2,7 +2,7 @@
     <fullName>Ubuntu One</fullName>
     <shortName>ubuntuone</shortName>
     <vendor>Canonical</vendor>
-    <version>203</version>
+    <version>1000</version>
     <singleInstanceCheck>1</singleInstanceCheck>
     <requireInstallationByRootUser>0</requireInstallationByRootUser>
     <requestedExecutionLevel>asInvoker</requestedExecutionLevel>