gnome-python-desktop r522 - trunk/evolution

[gjc svn gnome org]

Author: gjc
Date: Sat Jan 17 18:47:18 2009
New Revision: 522
URL: http://svn.gnome.org/viewvc/gnome-python-desktop?rev=522&view=rev

Log:
Bug 561727 â evolution still installed even if disabled

Modified:
   trunk/evolution/__init__.py
   trunk/evolution/wscript

Modified: trunk/evolution/__init__.py
==============================================================================
--- trunk/evolution/__init__.py	(original)
+++ trunk/evolution/__init__.py	Sat Jan 17 18:47:18 2009
@@ -17,9 +17,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-import ebook
-
-__version__ = ebook.__version__
+try:
+    import ebook
+except ImportError:
+    ebook = None
+    __version__ = None
+else:
+    __version__ = ebook.__version__
 
 try:
     import ecal

Modified: trunk/evolution/wscript
==============================================================================
--- trunk/evolution/wscript	(original)
+++ trunk/evolution/wscript	Sat Jan 17 18:47:18 2009
@@ -18,23 +18,6 @@
             conf.env.append_value('MODULES_TO_BUILD', 'evolution.ecal')            
 
 
-# def codegen(bld, module):
-#     cmd = bld.create_obj('command-output')
-#     cmd.command = bld.env()['CODEGEN']
-#     cmd.command_is_external = True
-#     cmd.prio = 5
-#     cmd.argv = [
-#         #'--py_ssize_t-clean',
-#         '--register', os.path.join(cmd.env['PYGTK_DEFSDIR'], 'pango-types.defs'),
-#         '--register', os.path.join(cmd.env['PYGTK_DEFSDIR'], 'gdk-types.defs'),
-#         '--register', os.path.join(cmd.env['PYGTK_DEFSDIR'], 'gtk-types.defs'),
-#         '--prefix', 'py'+module,
-#         '--override', cmd.input_file("%s.override" % module),
-#         cmd.input_file("%s.defs" % module),
-#         ]
-#     cmd.stdout = '%s.c' % module
-#     return cmd
-
 
 def build(bld):
     evolution_common = bld.new_task_gen('cc', 'objects', 'pyext')
@@ -77,10 +60,11 @@
         pyext.uselib = 'EVOLUTION_ECAL'
         pyext.install_path_var = '${PYTHONDIR}/gtk-2.0/evolution'
 
-    py = bld.new_task_gen('py')
-    py.install_path_var = '${PYTHONDIR}/gtk-2.0/evolution'
-    py.source = "__init__.py"
+    if 'evolution.ecal' in bld.env['MODULES_TO_BUILD'] \
+            or 'evolution.ebook' in bld.env['MODULES_TO_BUILD']:
+        py = bld.new_task_gen('py')
+        py.install_path_var = '${PYTHONDIR}/gtk-2.0/evolution'
+        py.source = "__init__.py"
 
-    bld.install_files('${DATADIR}/pygtk/2.0/defs',
-                      ['ebook.defs', 'ecal.defs'])
+    bld.install_files('${DATADIR}/pygtk/2.0/defs', ['ebook.defs', 'ecal.defs'])