gnome-python r633 - in trunk: . bonobo gconf gnome gnomecanvas

[gjc svn gnome org]

Author: gjc
Date: Sat Aug 23 15:20:53 2008
New Revision: 633
URL: http://svn.gnome.org/viewvc/gnome-python?rev=633&view=rev

Log:
Bug 548535, WAF part.

Modified:
   trunk/ChangeLog
   trunk/bonobo/wscript
   trunk/gconf/wscript
   trunk/gnome/wscript
   trunk/gnomecanvas/wscript
   trunk/wscript

Modified: trunk/bonobo/wscript
==============================================================================
--- trunk/bonobo/wscript	(original)
+++ trunk/bonobo/wscript	Sat Aug 23 15:20:53 2008
@@ -20,7 +20,7 @@
 
 def codegen(bld, module):
     cmd = bld.create_obj('command-output')
-    cmd.command = 'pygtk-codegen-2.0'
+    cmd.command = bld.env()['CODEGEN']
     cmd.command_is_external = True
     cmd.prio = 5
     cmd.argv = [

Modified: trunk/gconf/wscript
==============================================================================
--- trunk/gconf/wscript	(original)
+++ trunk/gconf/wscript	Sat Aug 23 15:20:53 2008
@@ -14,7 +14,7 @@
 
 def codegen(bld, module):
     cmd = bld.create_obj('command-output')
-    cmd.command = 'pygtk-codegen-2.0'
+    cmd.command = bld.env()['CODEGEN']
     cmd.command_is_external = True
     cmd.prio = 5
     cmd.argv = [

Modified: trunk/gnome/wscript
==============================================================================
--- trunk/gnome/wscript	(original)
+++ trunk/gnome/wscript	Sat Aug 23 15:20:53 2008
@@ -19,7 +19,7 @@
 
 def codegen(bld, module):
     cmd = bld.create_obj('command-output')
-    cmd.command = 'pygtk-codegen-2.0'
+    cmd.command = bld.env()['CODEGEN']
     cmd.command_is_external = True
     cmd.prio = 5
     cmd.argv = [

Modified: trunk/gnomecanvas/wscript
==============================================================================
--- trunk/gnomecanvas/wscript	(original)
+++ trunk/gnomecanvas/wscript	Sat Aug 23 15:20:53 2008
@@ -15,7 +15,7 @@
 
 def codegen(bld, module):
     cmd = bld.create_obj('command-output')
-    cmd.command = 'pygtk-codegen-2.0'
+    cmd.command = bld.env()['CODEGEN']
     cmd.command_is_external = True
     cmd.prio = 5
     cmd.argv = [

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sat Aug 23 15:20:53 2008
@@ -56,6 +56,10 @@
                             pkgvars=['defsdir'], mandatory=True)
     conf.env['PYGTK_DEFSDIR'] = values['PYGTK_DEFSDIR']
 
+    if not conf.find_program('pygobject-codegen-2.0', var='CODEGEN'):
+        if not conf.find_program('pygtk-codegen-2.0', var='CODEGEN'):
+            Params.fatal("Could not find pygobject/pygtk codegen")
+
     conf.env.append_value('CCDEFINES', 'HAVE_CONFIG_H')
 
     conf.env['ENABLE_MODULES'] = Params.g_options.enable_modules.split(',')