OS X packages are 64-bit only now.

dist/googlecode_upload_all.py

@@ -21,7 +21,7 @@ LABELS = {
   "deb":      ["Type-Package", "OpSys-Linux"],
   "rpm":      ["Type-Package", "OpSys-Linux", "Distro-Fedora"],
   "exe":      ["Type-Package", "OpSys-Windows", "Arch-i386"],
-  "dmg":      ["Type-Package", "OpSys-OSX", "Distro-SnowLeopard", "Arch-i386"],
+  "dmg":      ["Type-Package", "OpSys-OSX", "Distro-SnowLeopard", "Arch-x86-64"],
   32:         ["Arch-i386"],
   64:         ["Arch-x86-64"],
   "lucid":    ["Distro-Ubuntu"],
@@ -30,7 +30,7 @@ LABELS = {
   "oneiric":  ["Distro-Ubuntu"],
   "squeeze":  ["Distro-Debian"],
 }
-      
+
 
 MIN_SIZE = {
   "deb": 5000000,
@@ -88,110 +88,110 @@ class VersionInfo(object):
   def __init__(self, root_dir):
     filename = os.path.join(root_dir, "cmake/Version.cmake")
     data = open(filename).read()
-    
+
     self.info = {
       "major":      self._version(data, "MAJOR"),
       "minor":      self._version(data, "MINOR"),
       "patch":      self._version(data, "PATCH"),
       "prerelease": self._version(data, "PRERELEASE"),
     }
-    
+
     for key, value in self.info.items():
       setattr(self, key, value)
-    
+
   def _version(self, data, part):
     regex = r"^set\(CLEMENTINE_VERSION_%s (\w+)\)$" % part
     match = re.search(regex, data, re.MULTILINE)
-    
+
     if not match:
       return ""
-    
+
     return match.group(1)
-  
+
   def filename(self, release):
     (package, distro, arch) = release
-    
+
     data = dict(self.info)
     data["distro"]          = distro
     data["rpmarch"]         = RPM_ARCH.get(arch, None)
     data["debarch"]         = DEB_ARCH.get(arch, None)
     data["tildeprerelease"] = ""
     data["rpmrelease"]      = "1"
-    
+
     if data["prerelease"]:
       data["tildeprerelease"] = "~%s"  % data["prerelease"]
       data["rpmrelease"]      = "0.%s" % data["prerelease"]
-    
+
     return FILENAME_PATTERNS[package] % data
-  
+
   def description(self, release):
     (package, distro, arch) = release
-    
+
     version_name = "%(major)s.%(minor)s" % self.info
-    
+
     if self.patch is not "0":
       version_name += ".%s" % self.patch
-    
+
     if self.prerelease:
       version_name += " %s" % self.prerelease.upper()
-    
+
     os_name = DESCRIPTIONS[(package, distro)]
-    
+
     if arch is not None:
       os_name += " %d-bit" % arch
-      
+
     return "Clementine %s %s" % (version_name, os_name)
-  
+
   def labels(self, release):
     (package, distro, arch) = release
-    
+
     labels = LABELS.get(package, []) + \
              LABELS.get(distro, []) + \
              LABELS.get(arch, [])
-    
+
     if self.prerelease.startswith("rc"):
       labels.append("Release-RC")
     elif self.prerelease.startswith("beta"):
       labels.append("Release-Beta")
     else:
       labels.append("Release-Stable")
-      
+
     return labels
 
 
 def main():
   dist_dir = os.path.dirname(os.path.abspath(__file__))
   root_dir = os.path.normpath(os.path.join(dist_dir, ".."))
-  
+
   # Read the version file
   version = VersionInfo(root_dir)
-  
+
   # Display the files that will be uploaded
   for release in RELEASES:
     filename = version.filename(release)
     description = version.description(release)
-    
+
     if not os.path.exists(filename):
       print
       print "%s - file not found" % filename
       print "Run this script from a directory containing all the release packages"
       return 1
-    
+
     size = os.path.getsize(filename)
-    
+
     if size < MIN_SIZE[release[0]]:
       print
       print "%s - file not big enough" % filename
       print "%s files are expected to be at least %d bytes, but this was %d bytes" % (
         release[0], MIN_SIZE[release[0]], size)
       return 1
-    
+
     labels = version.labels(release)
-    
+
     print "%-40s %15s   %-55s %s" % (filename, "%d bytes" % size, description, " ".join(sorted(labels)))
-  
+
   print
-  
+
   # Prompt for username and password
   username = raw_input("Google username: ")
   if not username:
@@ -200,9 +200,9 @@ def main():
   password = getpass.getpass("Google Code password (different to your Google account): ")
   if not password:
     return 1
-    
+
   print
-    
+
   # Upload everything
   for release in RELEASES:
     (status, reason, url) = googlecode_upload.upload(
@@ -213,14 +213,14 @@ def main():
       summary=version.description(release),
       labels=version.labels(release),
     )
-    
+
     if status != 201:
       print "%s: (%d) %s" % (version.filename(release), status, reason)
     else:
       print "Uploaded %s" % url
-  
+
   return 0
-  
-  
+
+
 if __name__ == "__main__":
   sys.exit(main())