Merge lp:~mikemc/ubuntuone-windows-installer/add-cocoa-menu into lp:ubuntuone-windows-installer

[Mike McCracken]

- add building and bundling pyobjc cocoa version of the indicator menu

- add building and bundling pyobjc cocoa version of the indicator menu

Testing requires having lp:ubuntuone-cocoa-menu in $PARTS in your buildout.

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'scripts/devsetup/buildout.cfg'
--- scripts/devsetup/buildout.cfg	2012-10-30 15:31:27 +0000
+++ scripts/devsetup/buildout.cfg	2012-12-10 18:32:20 +0000
@@ -40,6 +40,8 @@
     http://launchpad.net/configglue/trunk/1.0/+download/configglue-1.0.tar.gz#egg=configglue
     http://u1.to/ralsina/7/Twisted-11.1.0-py2.7-win32.egg#egg=twisted
     http://people.canonical.com/~dobey/pyflakes-0.5.0-2ubuntu2.bo2.tar.gz#egg=pyflakes
+    http://u1.to/~mikemc/g/pyobjc_core-2.5.0b1-py2.7-macosx-10.6-x86_64.egg#egg=pyobjc-core-2.5.0b1
+    http://u1.to/~mikemc/7/pyobjc_framework_Cocoa-2.5.0b1-py2.7-macosx-10.6-x86_64.egg#egg=pyobjc-framework-Cocoa-2.5.0b1
 unzip = true
 newest = false
 versions = versions
@@ -64,7 +66,7 @@
     ... if platform.platform().startswith('Windows'):
     ...     self.options['eggs'] = 'comtypes'
     ... else:
-    ...     self.options['eggs'] = ''
+    ...     self.options['eggs'] = 'pyobjc-core\npyobjc-framework-Cocoa'
 
 # z3c.recipe.scripts generates a python interpreter that handles the
 # same python command line options as the real interpreter
@@ -91,6 +93,7 @@
     simplejson
     pylint
     pyflakes
+    mock
 versions = versions
 interpreter = python
 # Use extra-paths so generated python interpreter can see the source
@@ -169,6 +172,9 @@
 oauth = 1.0.1
 py2exe = 0.6.9
 comtypes = 0.6.2
+pyobjc-core = 2.5.0b1
+pyobjc-framework-Cocoa = 2.5.0b1
+mock = 1.0
 
 [sources]
 recipe = bazaarrecipeinfrae

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-11-21 00:05:32 +0000
+++ scripts/setup-mac.py	2012-12-10 18:32:20 +0000
@@ -52,6 +52,8 @@
     print "or see http://bitbucket.com/ronaldoussoren/py2app/"
     sys.exit()
 
+assert(py2app)
+
 # NOTE - this needs to be the full CN, not just a substring.
 # /usr/bin/codesign will find the right cert if you pass it a
 # substring, but the rest of the system wants an exact match.
@@ -448,7 +450,7 @@
         with open(os.path.join("data", "logging.conf"), "wb") as logconf:
             logconf.write(data)
 
-        # build fsevents daemon
+        print "building fsevents daemon"
         log_file_name = os.path.join(INSTALL_DIR,
                                      "fsevents-daemon-build.log")
         with open(log_file_name, 'w') as logfile:
@@ -478,6 +480,30 @@
                         os.path.join(dest_dir, "ubuntuone",
                                      "fseventsd.py"))
 
+        print "building pyobjc cocoa menu"
+        log_file_name = os.path.join(INSTALL_DIR,
+                                     "cocoa-menu-build.log")
+        with open(log_file_name, 'w') as logfile:
+            proj_path = os.path.join(self.source_dir,
+                                     "ubuntuone-cocoa-menu")
+            file_abs_path = os.path.abspath(__file__)
+            dist_path = os.path.join(os.path.dirname(file_abs_path),
+                                     'dist')
+            cmd = ("cd %s && "
+                   "PYTHONPATH=$PYTHONPATH:%s/lib/site-packages/ "
+                   "U1_SETUP_DIST_PATH=%s "
+                   "python setup.py py2app -d %s" %
+                   (proj_path, INSTALL_DIR, dist_path, dist_path))
+            logfile.write("# %s\n" % cmd)
+            retval = subprocess.call(cmd,
+                                     shell=True,
+                                     stderr=subprocess.STDOUT,
+                                     stdout=logfile
+                                     )
+            if retval != 0:
+                print "error running %r in %r. look in %r for details" %\
+                    (cmd, os.getcwd(), logfile.name)
+
         # clear path_importer_cache to make sure that a following
         # py2app step can see the newly-copied
         # INSTALL_PATH/lib/site-packages/ubuntu_sso module without
@@ -534,7 +560,11 @@
     # make sure we can see the prepared libraries:
     sys.path.insert(0, os.path.join(INSTALL_DIR, "lib", "site-packages"))
 
-    helper_app_paths = []
+    # start helper_app_paths with path to cocoa menu, which was built
+    # in the prepare step:
+    cocoa_menu_path = os.path.join('dist', 'Ubuntu One Menu.app')
+
+    helper_app_paths = [cocoa_menu_path]
 
     def do_setup(is_background, id, exename,
                  verbose=False,
@@ -763,13 +793,21 @@
 
         helper_src_resources = os.listdir(helper_src_resources_path)
 
-        # copy everything in resources that isn't include, lib, or *.app:
+        # copy everything in resources that isn't include or lib
         resources_to_copy = [p for p in helper_src_resources if
                              p not in resource_subdirs_to_link]
 
         for rsrc_name in resources_to_copy:
-            shutil.copy(os.path.join(helper_src_resources_path, rsrc_name),
-                        os.path.join(helper_dest_resources_path, rsrc_name))
+            src_rsrc_path = os.path.join(helper_src_resources_path, rsrc_name)
+            dest_rsrc_path = os.path.join(helper_dest_resources_path,
+                                          rsrc_name)
+            if os.path.isdir(src_rsrc_path):
+                if rsrc_name == 'English.lproj':
+                    shutil.copytree(src_rsrc_path, dest_rsrc_path)
+                else:
+                    print "WARNING: ignoring unexpected source directory",
+            else:
+                shutil.copy(src_rsrc_path, dest_rsrc_path)
 
         # link to resources/include and resources/lib from the main bundle:
         resources_to_link = [os.path.join("Resources", p)