Merge lp:~mikemc/ubuntuone-windows-installer/add-folder-to-favorites into lp:ubuntuone-windows-installer

Proposed by Mike McCracken
Status: Merged
Approved by: dobey
Approved revision: 157
Merged at revision: 154
Proposed branch: lp:~mikemc/ubuntuone-windows-installer/add-folder-to-favorites
Merge into: lp:ubuntuone-windows-installer
Diff against target: 29 lines (+4/-1)
1 file modified
scripts/devsetup/buildout.cfg (+4/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-windows-installer/add-folder-to-favorites
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+139979@code.launchpad.net

Commit message

- Add PyObjC LaunchServices egg to buildout on Mac OS.

Description of the change

- Add PyObjC LaunchServices egg to buildout on Mac OS.

Required for code that adds u1 folder to favorites (https://code.launchpad.net/~mikemc/ubuntuone-control-panel/add-to-favorites-mac/+merge/139530 )

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'scripts/devsetup/buildout.cfg'
--- scripts/devsetup/buildout.cfg 2012-11-21 00:24:36 +0000
+++ scripts/devsetup/buildout.cfg 2012-12-14 18:05:26 +0000
@@ -42,6 +42,8 @@
42 http://people.canonical.com/~dobey/pyflakes-0.5.0-2ubuntu2.bo2.tar.gz#egg=pyflakes42 http://people.canonical.com/~dobey/pyflakes-0.5.0-2ubuntu2.bo2.tar.gz#egg=pyflakes
43 http://u1.to/~mikemc/g/pyobjc_core-2.5.0b1-py2.7-macosx-10.6-x86_64.egg#egg=pyobjc-core-2.5.0b143 http://u1.to/~mikemc/g/pyobjc_core-2.5.0b1-py2.7-macosx-10.6-x86_64.egg#egg=pyobjc-core-2.5.0b1
44 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.0b144 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
45 http://u1.to/~mikemc/F/pyobjc_framework_LaunchServices-2.4a0-py2.7.egg#egg=pyobjc-framework-LaunchServices-2.4a0
46
45unzip = true47unzip = true
46newest = false48newest = false
47versions = versions49versions = versions
@@ -66,7 +68,7 @@
66 ... if platform.platform().startswith('Windows'):68 ... if platform.platform().startswith('Windows'):
67 ... self.options['eggs'] = 'comtypes'69 ... self.options['eggs'] = 'comtypes'
68 ... else:70 ... else:
69 ... self.options['eggs'] = 'pyobjc-core\npyobjc-framework-Cocoa'71 ... self.options['eggs'] = 'pyobjc-core\npyobjc-framework-Cocoa\npyobjc-framework-LaunchServices'
7072
71# z3c.recipe.scripts generates a python interpreter that handles the73# z3c.recipe.scripts generates a python interpreter that handles the
72# same python command line options as the real interpreter74# same python command line options as the real interpreter
@@ -174,6 +176,7 @@
174comtypes = 0.6.2176comtypes = 0.6.2
175pyobjc-core = 2.5.0b1177pyobjc-core = 2.5.0b1
176pyobjc-framework-Cocoa = 2.5.0b1178pyobjc-framework-Cocoa = 2.5.0b1
179pyobjc-framework-LaunchServices = 2.4a0
177mock = 1.0180mock = 1.0
178181
179[sources]182[sources]

Subscribers

People subscribed via source and target branches