Merge lp:~dobey/ubuntuone-windows-installer/add-data into lp:ubuntuone-windows-installer

[dobey]

Pull ubuntuone-client-data as a source now.
Grab the win and mac icons from ubuntuone-client-data.
Include the ubuntuone-client-data revno in revnos.txt.

This changes where the icon comes from, so please build test installers of this if you can, and ensure the icon is getting bundled correctly still.

[lp:~dobey/ubuntuone-windows-installer/add-data]

140. By dobey on 2012-09-14

Use self.source_dir in setup-mac

141. By dobey on 2012-09-14

Update conf.py as well, and include proper usage of it

142. By dobey on 2012-09-14

Don't grab the sp revno here as we don't know it yet

[Mike McCracken (mikemc)]

Looks good, works for me on darwin

review: Approve

[Brian Curtin (brian.curtin)]

Looks good on Windows.

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2012-09-14 21:10:25 +0000
@@ -0,0 +1,3 @@
+*.icns
+*.ico
+

=== modified file 'scripts/conf.py'
--- scripts/conf.py	2012-03-23 18:20:40 +0000
+++ scripts/conf.py	2012-09-14 21:10:25 +0000
@@ -27,6 +27,9 @@
 U1_CLIENT_BRANCHES = (
     "lp:ubuntuone-client" + BRANCH_POSTFIX,
 )
+U1_CLIENT_DATA_BRANCHES = (
+    "lp:ubuntuone-client-data" + BRANCH_POSTFIX,
+)
 U1_CONTROL_PANEL_BRANCHES = (
     "lp:ubuntuone-control-panel" + BRANCH_POSTFIX,
 )

=== modified file 'scripts/data/macapp_template.plist'
--- scripts/data/macapp_template.plist	2012-08-31 21:09:24 +0000
+++ scripts/data/macapp_template.plist	2012-09-14 21:10:25 +0000
@@ -12,7 +12,5 @@
 	<string>3.99.90 alpha 1</string>
 	<key>CFBundleVersion</key>
 	<string>3.99.90</string>
-	<key>CFBundleIconFile</key>
-	<string>u1_mac_icon.icns</string>
 </dict>
 </plist>

=== modified file 'scripts/devsetup/buildout.cfg'
--- scripts/devsetup/buildout.cfg	2012-08-15 19:19:16 +0000
+++ scripts/devsetup/buildout.cfg	2012-09-14 21:10:25 +0000
@@ -159,14 +159,15 @@
 [sources]
 recipe = bazaarrecipeinfrae
 urls =    
+    lp:ubuntu-sso-client ubuntu-sso-client
     lp:ubuntuone-client ubuntuone-client
-    lp:ubuntu-sso-client ubuntu-sso-client
+    lp:ubuntuone-client-data ubuntuone-client-data
     lp:ubuntuone-control-panel ubuntuone-control-panel
     lp:ubuntuone-windows-installer ubuntuone-windows-installer
 
 [sourcedeps]
 recipe = bazaarrecipeinfrae
 urls =
+    lp:dirspec dirspec
     lp:ubuntuone-dev-tools ubuntuone-dev-tools
-    lp:dirspec dirspec
     lp:ubuntuone-storage-protocol ubuntuone-storage-protocol
\ No newline at end of file

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-09-11 15:41:05 +0000
+++ scripts/setup-mac.py	2012-09-14 21:10:25 +0000
@@ -214,6 +214,7 @@
                 os.mkdir(self.source_dir)
 
             branch_and_merge(conf.U1_CLIENT_BRANCHES)
+            branch_and_merge(conf.U1_CLIENT_DATA_BRANCHES)
             branch_and_merge(conf.U1_CONTROL_PANEL_BRANCHES)
             branch_and_merge(conf.UBUNTU_SSO_BRANCHES)
             branch_and_merge(conf.U1_STORAGE_PROTOCOL_BRANCHES)
@@ -395,12 +396,25 @@
 
         os.chdir(start_dir)
 
+        # Get the revno for ubuntuone-client-data too
+        os.chdir(os.path.join(self.source_dir, "ubuntuone-client-data"))
+        u1cd_revno = subprocess.Popen(
+            ["bzr", "revno", "."],
+            stdout=subprocess.PIPE).communicate()[0]
+        os.chdir(start_dir)
+        # Copy the main icons file over
+        shutil.copyfile(os.path.join(self.source_dir, "ubuntuone-client-data",
+                                     "ubuntuone.icns"),
+                        os.path.join("data", "ubuntuone.icns"))
+
         # Create revno file
         revno_str = ("ubuntu-sso-client: %s, "
                      "ubuntuone-client: %s, "
+                     "ubuntuone-client-data: %s, "
                      "ubuntuone-control-panel: %s, "
                      "ubuntuone-storage-protocol: %s" %
-                     (sso_revno, u1client_revno, u1cp_revno, sp_revno))
+                     (sso_revno, u1client_revno, u1cd_revno,
+                      u1cp_revno, sp_revno))
         with open(os.path.join("data", "revnos.txt"), "w+") as revnos:
             revnos.write(revno_str)
 

=== modified file 'scripts/setup.py'
--- scripts/setup.py	2012-09-05 19:08:47 +0000
+++ scripts/setup.py	2012-09-14 21:10:25 +0000
@@ -160,6 +160,7 @@
             if not os.path.isdir(folder):
                 os.mkdir(folder)
         branch_and_merge(conf.U1_CLIENT_BRANCHES)
+        branch_and_merge(conf.U1_CLIENT_DATA_BRANCHES)
         branch_and_merge(conf.U1_CONTROL_PANEL_BRANCHES)
         branch_and_merge(conf.UBUNTU_SSO_BRANCHES)
         branch_and_merge(conf.U1_STORAGE_PROTOCOL_BRANCHES)
@@ -251,12 +252,26 @@
             stdout=subprocess.PIPE).communicate()[0]
         os.chdir(start_dir)
 
+        # Get the revno for ubuntuone-client-data too
+        os.chdir(os.path.join("sources", "ubuntuone-client-data"))
+        u1cd_revno = subprocess.Popen(
+            ["bzr", "revno", "."],
+            stdout=subprocess.PIPE).communicate()[0]
+        os.chdir(start_dir)
+        # Copy the main icons file over
+        shutil.copyfile(os.path.join("sources", "ubuntuone-client-data",
+                                     "ubuntuone.ico"),
+                        os.path.join("ubuntuone.ico"))
+
         # Create revno file
+        revno_str = ("ubuntu-sso-client: %s, "
+                     "ubuntuone-client: %s, "
+                     "ubuntuone-client-data: %s, "
+                     "ubuntuone-control-panel: %s " %
+                     (sso_revno, u1client_revno, u1cd_revno,
+                      u1cp_revno))
         with open(os.path.join("data", "revnos.txt"), "w+") as revnos:
-            revnos.write("ubuntu-sso-client: %s"
-                    "ubuntuone-client: %s"
-                    "ubuntuone-control-panel: %s" %
-                    (sso_revno, u1client_revno, u1cp_revno))
+            revnos.write(revno_str)
 
         # Copy storage-protocol's pem files
         shutil.copyfile(os.path.join("sources",
@@ -307,27 +322,27 @@
     windows = [
         {
             'script': 'bin/ubuntuone-syncdaemon',
-            'icon_resources': [(0, 'ubuntu_one.ico')]
+            'icon_resources': [(0, 'ubuntuone.ico')]
         },
         {
             'script': 'bin/ubuntuone-control-panel-qt',
-            'icon_resources': [(0, 'ubuntu_one.ico')]
+            'icon_resources': [(0, 'ubuntuone.ico')]
         },
         {
             'script': 'bin/ubuntu-sso-login',
-            'icon_resources': [(0, 'ubuntu_one.ico')]
+            'icon_resources': [(0, 'ubuntuone.ico')]
         },
         {
             'script': 'bin/ubuntu-sso-login-qt',
-            'icon_resources': [(0, 'ubuntu_one.ico')]
+            'icon_resources': [(0, 'ubuntuone.ico')]
         },
         {
             'script': 'bin/ubuntu-sso-proxy-creds-qt',
-            'icon_resources': [(0, 'ubuntu_one.ico')]
+            'icon_resources': [(0, 'ubuntuone.ico')]
         },
         {
             'script': 'bin/ubuntu-sso-ssl-certificate-qt',
-            'icon_resources': [(0, 'ubuntu_one.ico')]
+            'icon_resources': [(0, 'ubuntuone.ico')]
         },
     ]
 

=== removed file 'scripts/ubuntu_one.ico'
Binary files scripts/ubuntu_one.ico	2011-12-28 19:15:16 +0000 and scripts/ubuntu_one.ico	1970-01-01 00:00:00 +0000 differ
=== modified file 'scripts/ubuntuone.xml'
--- scripts/ubuntuone.xml	2012-09-05 19:08:47 +0000
+++ scripts/ubuntuone.xml	2012-09-14 21:10:25 +0000
@@ -48,7 +48,7 @@
                     <runInTerminal>0</runInTerminal>
                     <windowsExec>${installdir}\dist\ubuntuone-control-panel-qt.exe</windowsExec>
                     <windowsExecArgs>--with-icon</windowsExecArgs>
-                    <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
+                    <windowsIcon>${installdir}/ubuntuone.ico</windowsIcon>
                     <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
                 </shortcut>
             </desktopShortcutList>
@@ -94,7 +94,7 @@
                             <origin>data</origin>
                         </distributionDirectory>
                         <distributionFile>
-                            <origin>ubuntu_one.ico</origin>
+                            <origin>ubuntuone.ico</origin>
                         </distributionFile>
                     </distributionFileList>
                 </folder>
@@ -135,7 +135,7 @@
                     <runInTerminal>0</runInTerminal>
                     <windowsExec>${installdir}\dist\ubuntuone-control-panel-qt.exe</windowsExec>
                     <windowsExecArgs>--with-icon</windowsExecArgs>
-                    <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
+                    <windowsIcon>${installdir}/ubuntuone.ico</windowsIcon>
                     <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
                 </startMenuShortcut>
                 <startMenuFileShortcut>