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

[gjc svn gnome org]

Author: gjc
Date: Sun May  4 14:46:39 2008
New Revision: 485
URL: http://svn.gnome.org/viewvc/gnome-python-desktop?rev=485&view=rev

Log:
This time it should really work with WAF 1.4.1... (API change)

Modified:
   trunk/evolution/wscript
   trunk/gnomeapplet/wscript
   trunk/gnomedesktop/wscript
   trunk/gnomekeyring/wscript
   trunk/gnomeprint/wscript
   trunk/gtksourceview/wscript
   trunk/gtop/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	Sun May  4 14:46:39 2008
@@ -35,7 +35,6 @@
 
 
 def build(bld):
-
     evolution_common = bld.create_obj('cc', 'objects', 'pyext')
     evolution_common.name = 'evolution_common'
     evolution_common.source = 'override_common.c'
@@ -45,7 +44,7 @@
     
     if bld.env()['ENABLE_EVOLUTION_EBOOK']:
         codegen(bld, 'ebook')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.includes = '.'
         pyext.source = '''
 	ebookmodule.c
@@ -63,7 +62,7 @@
 
     if bld.env()['ENABLE_EVOLUTION_ECAL']:
         codegen(bld, 'ecal')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.includes = '.'
         pyext.source = '''
 	ecalmodule.c

Modified: trunk/gnomeapplet/wscript
==============================================================================
--- trunk/gnomeapplet/wscript	(original)
+++ trunk/gnomeapplet/wscript	Sun May  4 14:46:39 2008
@@ -34,7 +34,7 @@
     
     if bld.env()['ENABLE_GNOMEAPPLET']:
         codegen(bld, 'applet')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'appletmodule.c applet.c'
         pyext.target = 'gnomeapplet'
         pyext.uselib = 'GNOMEAPPLET'

Modified: trunk/gnomedesktop/wscript
==============================================================================
--- trunk/gnomedesktop/wscript	(original)
+++ trunk/gnomedesktop/wscript	Sun May  4 14:46:39 2008
@@ -31,7 +31,7 @@
     
     if bld.env()['ENABLE_GNOMEDESKTOP']:
         codegen(bld, '_gnomedesktop')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = '_gnomedesktopmodule.c _gnomedesktop.c'
         pyext.target = '_gnomedesktop'
         pyext.uselib = 'GNOMEDESKTOP'

Modified: trunk/gnomekeyring/wscript
==============================================================================
--- trunk/gnomekeyring/wscript	(original)
+++ trunk/gnomekeyring/wscript	Sun May  4 14:46:39 2008
@@ -37,7 +37,7 @@
     
     if bld.env()['ENABLE_GNOMEKEYRING']:
         codegen(bld, 'gnomekeyring')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'gnomekeyringmodule.c gnomekeyring.c'
         pyext.target = 'gnomekeyring'
         pyext.uselib = 'GNOMEKEYRING'

Modified: trunk/gnomeprint/wscript
==============================================================================
--- trunk/gnomeprint/wscript	(original)
+++ trunk/gnomeprint/wscript	Sun May  4 14:46:39 2008
@@ -36,7 +36,7 @@
     
     if bld.env()['ENABLE_GNOMEPRINT']:
         codegen(bld, 'print')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'printmodule.c print.c art-gtype.c'
         pyext.target = '_print'
         pyext.uselib = 'GNOMEPRINT'
@@ -46,7 +46,7 @@
 
     if bld.env()['ENABLE_GNOMEPRINTUI']:
         codegen(bld, 'printui')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'printuimodule.c printui.c'
         pyext.target = 'ui'
         pyext.uselib = 'GNOMEPRINTUI'

Modified: trunk/gtksourceview/wscript
==============================================================================
--- trunk/gtksourceview/wscript	(original)
+++ trunk/gtksourceview/wscript	Sun May  4 14:46:39 2008
@@ -32,7 +32,7 @@
     
     if bld.env()['ENABLE_GTKSOURCEVIEW']:
         codegen(bld, 'gtksourceview')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'gtksourceviewmodule.c gtksourceview.c'
         pyext.target = 'gtksourceview'
         pyext.uselib = 'GTKSOURCEVIEW'

Modified: trunk/gtop/wscript
==============================================================================
--- trunk/gtop/wscript	(original)
+++ trunk/gtop/wscript	Sun May  4 14:46:39 2008
@@ -10,7 +10,7 @@
 def build(bld):
     
     if bld.env()['ENABLE_GTOP']:
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'gtop.c'
         pyext.target = 'gtop'
         pyext.uselib = 'GTOP'

Modified: trunk/mediaprofiles/wscript
==============================================================================
--- trunk/mediaprofiles/wscript	(original)
+++ trunk/mediaprofiles/wscript	Sun May  4 14:46:39 2008
@@ -31,7 +31,7 @@
     
     if bld.env()['ENABLE_MEDIAPROFILES']:
         codegen(bld, 'mediaprofiles')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'mediaprofilesmodule.c mediaprofiles.c'
         pyext.target = 'mediaprofiles'
         pyext.uselib = 'MEDIAPROFILES'

Modified: trunk/metacity/wscript
==============================================================================
--- trunk/metacity/wscript	(original)
+++ trunk/metacity/wscript	Sun May  4 14:46:39 2008
@@ -43,7 +43,7 @@
     
     if bld.env()['ENABLE_METACITY']:
         codegen(bld, 'metacity')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'metacitymodule.c metacity.c'
         pyext.target = 'metacity'
         pyext.uselib = 'METACITY'

Modified: trunk/nautilusburn/wscript
==============================================================================
--- trunk/nautilusburn/wscript	(original)
+++ trunk/nautilusburn/wscript	Sun May  4 14:46:39 2008
@@ -31,7 +31,7 @@
     
     if bld.env()['ENABLE_NAUTILUSBURN']:
         codegen(bld, 'nautilus_burn')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'nb_module.c nautilus_burn.c nb_track.c'
         pyext.includes = '.'
         pyext.target = 'nautilusburn'

Modified: trunk/rsvg/wscript
==============================================================================
--- trunk/rsvg/wscript	(original)
+++ trunk/rsvg/wscript	Sun May  4 14:46:39 2008
@@ -31,7 +31,7 @@
     
     if bld.env()['ENABLE_RSVG']:
         codegen(bld, 'rsvg')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'rsvgmodule.c rsvg.c'
         pyext.target = 'rsvg'
         pyext.uselib = 'RSVG'

Modified: trunk/totem/wscript
==============================================================================
--- trunk/totem/wscript	(original)
+++ trunk/totem/wscript	Sun May  4 14:46:39 2008
@@ -31,7 +31,7 @@
     
     if bld.env()['ENABLE_PLPARSER']:
         codegen(bld, 'plparser')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'plparsermodule.c plparser.c'
         pyext.target = 'plparser'
         pyext.uselib = 'PLPARSER'

Modified: trunk/wnck/wscript
==============================================================================
--- trunk/wnck/wscript	(original)
+++ trunk/wnck/wscript	Sun May  4 14:46:39 2008
@@ -31,7 +31,7 @@
     
     if bld.env()['ENABLE_WNCK']:
         codegen(bld, 'wnck')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.env.append_value('CCDEFINES', 'WNCK_I_KNOW_THIS_IS_UNSTABLE')
         pyext.source = 'wnckmodule.c wnck.c'
         pyext.target = 'wnck'

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sun May  4 14:46:39 2008
@@ -13,6 +13,8 @@
 import shutil
 import glob
 import sys
+import types
+
 
 def dist_hook():
     for docs_module in ['gnomeprint', 'gnomeprintui', 'gtksourceview']:
@@ -81,8 +83,20 @@
 
 
 def build(bld):
+
+    ## cater for WAF API change between 1.3 and 1.4
+    waf_version = [int (s) for s in Params.g_version.split('.')]
+    if waf_version >= [1,4]:
+        def create_pyext(bld):
+            return bld.create_obj('cc', 'shlib', 'pyext')
+    else:
+        def create_pyext(bld):
+            return bld.create_obj('cc', 'plugin', 'pyext')
+    bld.create_pyext = types.MethodType(create_pyext, bld)
+
+
     ## generate and install the .pc file
-    obj=bld.create_obj('subst')
+    obj = bld.create_obj('subst')
     obj.source = 'gnome-python-desktop-2.0.pc.in'
     obj.target = 'gnome-python-desktop-2.0.pc'
     obj.dict = {