gnome-python r626 - in trunk: . bonobo gconf gnome gnomecanvas gnomevfs

[gjc svn gnome org]

Author: gjc
Date: Sun May  4 14:51:10 2008
New Revision: 626
URL: http://svn.gnome.org/viewvc/gnome-python?rev=626&view=rev

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

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

Modified: trunk/bonobo/wscript
==============================================================================
--- trunk/bonobo/wscript	(original)
+++ trunk/bonobo/wscript	Sun May  4 14:51:10 2008
@@ -42,7 +42,7 @@
         py.source = "__init__.py"
 
         codegen(bld, 'bonobo')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'bonobomodule.c bonobo.c bonobo-arg.c pybonobo.c'
         pyext.target = '_bonobo'
         pyext.uselib = 'BONOBO'
@@ -55,7 +55,7 @@
                                         'bonobo-types.defs',
                                         ])
 
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'activationmodule.c'
         pyext.target = 'activation'
         pyext.uselib = 'BONOBO'
@@ -67,7 +67,7 @@
     if bld.env()['ENABLE_BONOBOUI']:
         codegen(bld, 'bonoboui')
 
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'bonobouimodule.c bonoboui.c'
         pyext.target = 'ui'
         pyext.uselib = 'BONOBOUI'

Modified: trunk/gconf/wscript
==============================================================================
--- trunk/gconf/wscript	(original)
+++ trunk/gconf/wscript	Sun May  4 14:51:10 2008
@@ -29,7 +29,7 @@
     
     if bld.env()['ENABLE_GCONF']:
         codegen(bld, 'gconf')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'gconfmodule.c gconf.c gconf-fixes.c gconf-types.c'
         pyext.target = 'gconf'
         pyext.uselib = 'GCONF'

Modified: trunk/gnome/wscript
==============================================================================
--- trunk/gnome/wscript	(original)
+++ trunk/gnome/wscript	Sun May  4 14:51:10 2008
@@ -40,7 +40,7 @@
 
         codegen(bld, 'gnome')
 
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'gnomemodule.c gnome.c'
         pyext.target = '_gnome'
         pyext.uselib = 'GNOME'
@@ -56,7 +56,7 @@
     if bld.env()['ENABLE_GNOMEUI']:
         codegen(bld, 'ui')
 
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'uimodule.c ui.c'
         pyext.target = 'ui'
         pyext.uselib = 'GNOMEUI'

Modified: trunk/gnomecanvas/wscript
==============================================================================
--- trunk/gnomecanvas/wscript	(original)
+++ trunk/gnomecanvas/wscript	Sun May  4 14:51:10 2008
@@ -34,7 +34,7 @@
     
     if bld.env()['ENABLE_CANVAS']:
         codegen(bld, 'canvas')
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'canvasmodule.c canvas.c'
         pyext.target = 'gnomecanvas'
         pyext.uselib = 'GNOMECANVAS'

Modified: trunk/gnomevfs/wscript
==============================================================================
--- trunk/gnomevfs/wscript	(original)
+++ trunk/gnomevfs/wscript	Sun May  4 14:51:10 2008
@@ -27,7 +27,7 @@
         py.inst_dir = vfsdir
         py.source = "__init__.py"
 
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = '''
 vfsmodule.c vfs-uri.c vfs-file-info.c vfs-dir-handle.c
 vfs-handle.c vfs-xfer-progress-info.c vfs-context.c
@@ -40,7 +40,7 @@
         pyext.inst_dir = vfsdir
 
     if bld.env()['ENABLE_GNOMEVFSBONOBO']:
-        pyext = bld.create_obj('cc', 'plugin', 'pyext')
+        pyext = bld.create_pyext()
         pyext.source = 'vfsbonobomodule.c'
         pyext.target = 'gnomevfsbonobo'
         pyext.uselib = 'GNOMEVFSBONOBO'

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sun May  4 14:51:10 2008
@@ -13,6 +13,7 @@
 import shutil
 import glob
 import sys
+import types
 
 def dist_hook():
     for html_file in glob.glob(os.path.join('..', 'build', 'default', 'docs', 'gnomevfs', 'html', '*')):
@@ -64,6 +65,16 @@
 
 
 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.source = 'gnome-python-2.0.pc.in'