Merge lp:~mikemc/ubuntuone-windows-installer/calling-mr-scripty into lp:ubuntuone-windows-installer

[Mike McCracken]

- Use mr.scripty buildout recipe to add comtypes to development eggs only on windows.

- Use mr.scripty buildout recipe to add comtypes to development eggs only on windows.

This lets us build a u1trial and u1lint that can see comtypes without breaking darwin.

Tested on darwin and windows.

TO TEST:

#darwin
% cd buildout/scripts/devsetup
% bin/buildout install u1trial
% grep "comtypes" bin/u1trial
# should show nothing

# windows
cd buildout\scripts\devsetup
bin\buildout.exe install u1trial
# whatever you want to verify that comtypes is in there

[Roberto Alsina (ralsina)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'scripts/devsetup/buildout.cfg'
--- scripts/devsetup/buildout.cfg	2012-09-14 20:05:56 +0000
+++ scripts/devsetup/buildout.cfg	2012-10-17 17:32:25 +0000
@@ -48,16 +48,29 @@
 versions = versions
 eggs =
     py2exe
-    comtypes
 # Include the common [development] eggs
     ${development:eggs}
 interpreter = python
 
+# using the scripty recipe to add comtypes to the development eggs
+# only on windows. Doing this instead of putting it in the windows
+# section because the u1lint/u1trial/etc scripts generated below
+# shouldn't depend on the windows section.
+[scripty]
+recipe = mr.scripty
+init = 
+    ... import platform
+    ... if platform.platform().startswith('Windows'):
+    ...     self.options['eggs'] = 'comtypes'
+    ... else:
+    ...     self.options['eggs'] = ''
+
 # z3c.recipe.scripts generates a python interpreter that handles the
 # same python command line options as the real interpreter
 [development]
 recipe = z3c.recipe.scripts
 eggs =
+    ${scripty:eggs}
     twisted
     qt4reactor
     python-distutils-extra