Merge lp:~dobey/ubuntuone-client-data/move-icons into lp:ubuntuone-client-data

[dobey]

Move the icons under a data/ directory for distutils-extra.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-client-data/move-icons 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

=== added directory 'data'
=== renamed directory 'icons' => 'data/icons'
=== modified file 'setup.py'
--- setup.py	2012-09-05 21:15:26 +0000
+++ setup.py	2012-09-14 13:51:05 +0000
@@ -74,6 +74,7 @@
                    '128x128',
                    '256x256',
                    ]
+ICONSDIR = os.path.join(os.getcwd(), 'data', 'icons')
 
 
 def touch(filename, timestamp=None):
@@ -92,15 +93,14 @@
 
     def run(self):
         """Generate the icons."""
-        iconsdir = os.path.join(os.getcwd(), 'icons')
-        if os.path.exists(iconsdir):
-            dirtime = os.stat(iconsdir).st_mtime
+        if os.path.exists(ICONSDIR):
+            dirtime = os.stat(ICONSDIR).st_mtime
             filetime = os.stat(ICON_SVG_FILE).st_mtime
             if (dirtime >= filetime):
-                touch(iconsdir)
+                touch(ICONSDIR)
                 return
         else:
-            os.makedirs(iconsdir)
+            os.makedirs(ICONSDIR)
 
         icontool_render = find_executable('icontool-render')
         if icontool_render is None:
@@ -108,10 +108,10 @@
             return
 
         for size in ICON_RENDER_SIZES:
-            args = [icontool_render, '-s', size, '-o', iconsdir, ICON_SVG_FILE]
+            args = [icontool_render, '-s', size, '-o', ICONSDIR, ICON_SVG_FILE]
             subprocess.call(args)
 
-        touch(iconsdir)
+        touch(ICONSDIR)
 
 
 class BuildICNS(BuildPNG):
@@ -137,8 +137,7 @@
 
         missing = []
         for size in ICNS_EMBED_SIZES:
-            orig_file = os.path.join(os.getcwd(), 'icons',
-                                     size, 'apps', 'ubuntuone.png')
+            orig_file = os.path.join(ICONSDIR, size, 'apps', 'ubuntuone.png')
             link_file = os.path.join(icns_dir, 'icon_' + size + '.png')
             if os.path.exists(orig_file):
                 if os.path.exists(link_file):
@@ -172,8 +171,7 @@
 
         convert_args = [convert]
         for size in ICO_EMBED_SIZES:
-            orig_file = os.path.join(os.getcwd(), 'icons',
-                                     size, 'apps', 'ubuntuone.png')
+            orig_file = os.path.join(ICONSDIR, size, 'apps', 'ubuntuone.png')
             if os.path.exists(orig_file):
                 convert_args.append(orig_file)
             else: