Merge lp:~mikemc/ubuntuone-windows-installer/fix-1037313-add-revnos into lp:ubuntuone-windows-installer

[Mike McCracken]

- Add revno information to Finder-visible short version string. (LP: #1037313)

- Add revno information to Finder-visible short version string. (LP: #1037313)

[lp:~mikemc/ubuntuone-windows-installer/fix-1037313-add-revnos]

140. By Mike McCracken on 2012-08-15

Get revnos each time in do_setup so that this still works when calling prepare for the first time.

[Roberto Alsina (ralsina)]

review: Approve

[lp:~mikemc/ubuntuone-windows-installer/fix-1037313-add-revnos]

141. By Mike McCracken on 2012-08-17

merge with trunk

[dobey (dobey)]

review: Approve

=== modified file 'scripts/data/macapp_template.plist'
--- scripts/data/macapp_template.plist	2012-06-05 19:59:55 +0000
+++ scripts/data/macapp_template.plist	2012-08-17 18:18:19 +0000
@@ -8,5 +8,9 @@
 	<string>ubuntuone.icns</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+	<key>CFBundleShortVersionString</key>
+	<string>3.0.0</string>
+	<key>CFBundleVersion</key>
+	<string>3.0.0.1</string>
 </dict>
-</plist>
\ No newline at end of file
+</plist>

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-08-02 17:30:48 +0000
+++ scripts/setup-mac.py	2012-08-17 18:18:19 +0000
@@ -389,12 +389,13 @@
         os.chdir(start_dir)
 
         # Create revno file
+        revno_str = ("ubuntu-sso-client: %s, "
+                     "ubuntuone-client: %s, "
+                     "ubuntuone-control-panel: %s, "
+                     "ubuntuone-storage-protocol: %s" %
+                     (sso_revno, u1client_revno, u1cp_revno, sp_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"
-                         "ubuntuone-storage-protocol: %s" %
-                         (sso_revno, u1client_revno, u1cp_revno, sp_revno))
+            revnos.write(revno_str)
 
         # Copy storage-protocol's pem files
         shutil.copyfile(os.path.join(self.source_dir,
@@ -465,6 +466,7 @@
     data_files = glob.glob("data/*")
 
     master_plist = Plist.fromFile('data/macapp_template.plist')
+
     master_options = {"includes": ['google.protobuf.descriptor',
                                    'sip',
                                    'twisted.web.resource',
@@ -508,6 +510,14 @@
 
         print "calling setup for:", name
         plist = copy.deepcopy(master_plist)
+
+        if os.path.exists('data/revnos.txt'):
+            revno_str = open('data/revnos.txt', 'r').read()
+            ver_string = "%s (%s)" % (
+                master_plist["CFBundleShortVersionString"],
+                revno_str)
+            plist.update(CFBundleShortVersionString=ver_string)
+
         plist.update(LSUIElement=is_background,
                      CFBundleIdentifier=id,
                      CFBundleExecutable=exename,