gnome-python-desktop r494 - in trunk: . evolution gnomeapplet gnomedesktop gnomekeyring gnomeprint gtksourceview mediaprofiles metacity nautilusburn rsvg totem wnck

[gjc svn gnome org]

Author: gjc
Date: Sat Aug 23 15:38:21 2008
New Revision: 494
URL: http://svn.gnome.org/viewvc/gnome-python-desktop?rev=494&view=rev

Log:
Bug 548535 â pygtk-codegen-2.0 -> pygobject-codegen-2.0 (WAF part).

Modified:
   trunk/ChangeLog
   trunk/evolution/wscript
   trunk/gnomeapplet/wscript
   trunk/gnomedesktop/wscript
   trunk/gnomekeyring/wscript
   trunk/gnomeprint/wscript
   trunk/gtksourceview/wscript
   trunk/mediaprofiles/wscript
   trunk/metacity/wscript
   trunk/nautilusburn/wscript
   trunk/rsvg/wscript
   trunk/totem/wscript
   trunk/wnck/wscript
   trunk/wscript

Modified: trunk/evolution/wscript
==============================================================================
--- trunk/evolution/wscript	(original)
+++ trunk/evolution/wscript	Sat Aug 23 15:38:21 2008
@@ -22,7 +22,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/gnomeapplet/wscript
==============================================================================
--- trunk/gnomeapplet/wscript	(original)
+++ trunk/gnomeapplet/wscript	Sat Aug 23 15:38:21 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/gnomedesktop/wscript
==============================================================================
--- trunk/gnomedesktop/wscript	(original)
+++ trunk/gnomedesktop/wscript	Sat Aug 23 15:38:21 2008
@@ -13,7 +13,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.argv = [
         '--py_ssize_t-clean',

Modified: trunk/gnomekeyring/wscript
==============================================================================
--- trunk/gnomekeyring/wscript	(original)
+++ trunk/gnomekeyring/wscript	Sat Aug 23 15:38:21 2008
@@ -17,7 +17,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/gnomeprint/wscript
==============================================================================
--- trunk/gnomeprint/wscript	(original)
+++ trunk/gnomeprint/wscript	Sat Aug 23 15:38:21 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/gtksourceview/wscript
==============================================================================
--- trunk/gtksourceview/wscript	(original)
+++ trunk/gtksourceview/wscript	Sat Aug 23 15:38:21 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/mediaprofiles/wscript
==============================================================================
--- trunk/mediaprofiles/wscript	(original)
+++ trunk/mediaprofiles/wscript	Sat Aug 23 15:38:21 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/metacity/wscript
==============================================================================
--- trunk/metacity/wscript	(original)
+++ trunk/metacity/wscript	Sat Aug 23 15:38:21 2008
@@ -22,7 +22,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/nautilusburn/wscript
==============================================================================
--- trunk/nautilusburn/wscript	(original)
+++ trunk/nautilusburn/wscript	Sat Aug 23 15:38:21 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/rsvg/wscript
==============================================================================
--- trunk/rsvg/wscript	(original)
+++ trunk/rsvg/wscript	Sat Aug 23 15:38:21 2008
@@ -13,7 +13,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/totem/wscript
==============================================================================
--- trunk/totem/wscript	(original)
+++ trunk/totem/wscript	Sat Aug 23 15:38:21 2008
@@ -13,7 +13,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/wnck/wscript
==============================================================================
--- trunk/wnck/wscript	(original)
+++ trunk/wnck/wscript	Sat Aug 23 15:38:21 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/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sat Aug 23 15:38:21 2008
@@ -68,6 +68,10 @@
     conf.env['GNOME_PYTHON_DEFSDIR'] = values['GNOME_PYTHON_DEFSDIR']
     conf.env['GNOME_PYTHON_ARG_TYPES_DIR'] = values['GNOME_PYTHON_ARGTYPESDIR']
 
+    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(',')