Merge lp:~dobey/ubuntuone-client-data/mac-build-icns into lp:ubuntuone-client-data

[dobey]

Require iconutil on darwin to build the .icns file.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Mike McCracken (mikemc)]

This builds a .icns on macos correctly for me.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-client-data/mac-build-icns into lp:ubuntuone-client-data failed. Below is the output from the failed tests.

running build
running build_i18n
intltool-update -p -g ubuntuone-client-data
running build_icons
running build_help
running clean
WARNING: the following files are not recognized by DistUtilsExtra.auto:
  po/LINGUAS
  run-tests
  ubuntuone-icons.svg
  ubuntuone.icns
  ubuntuone.ico

+ python ./setup.py build clean
++ which python3
+ '[' -x /usr/bin/python3 ']'
+ python3 ./setup.py build clean
To build this program you need https://launchpad.net/python-distutils-extra

=== modified file 'setup.py'
--- setup.py	2012-09-14 13:43:48 +0000
+++ setup.py	2012-10-05 21:36:21 +0000
@@ -58,14 +58,11 @@
                      '256x256', '256x256@2x',
                      '512x512', '512x512@2x',
                      ]
-# The @2x sizes are commented out here for now, as png2icns doesn't support
-# embedding them, as it should. It seems to hardcode the list of allowable
-# sizes, and they are duplicates or not allowed, which creates errors.
-ICNS_EMBED_SIZES = ['16x16',  # '16x16@2x',
-                    '32x32',  # '32x32@2x',
-                    '128x128',  # '128x128@2x',
-                    '256x256',  # '256x256@2x',
-                    '512x512',  # '512x512@2x',
+ICNS_EMBED_SIZES = ['16x16', '16x16@2x',
+                    '32x32', '32x32@2x',
+                    '128x128', '128x128@2x',
+                    '256x256', '256x256@2x',
+                    '512x512', '512x512@2x',
                     ]
 ICO_EMBED_SIZES = ['16x16',
                    '24x24',
@@ -121,13 +118,15 @@
 
     def run(self):
         """Generate the icons."""
-        BuildPNG.run(self)
-        png2icns = find_executable('png2icns')
-        if png2icns is None:
-            sys.stderr.write('png2icns is required to build the icns file.')
+        if sys.platform != 'darwin':
+            raise OSError('Can only build high res icns files on darwin.')
+
+        iconutil = find_executable('iconutil')
+        if iconutil is None:
+            sys.stderr.write('iconutil is required to build the icns file.')
             return
 
-        icns_args = [png2icns, 'ubuntuone.icns']
+        icns_args = [iconutil, '-c', 'icns', 'ubuntuone.iconset']
         icns_dir = os.path.join(os.getcwd(), 'ubuntuone.iconset')
         try:
             os.makedirs(icns_dir)