gnome-python r625 - in trunk: . bonobo docs/gnomevfs gconf gnome gnomecanvas gnomevfs

[gjc svn gnome org]

Author: gjc
Date: Sun May  4 11:33:16 2008
New Revision: 625
URL: http://svn.gnome.org/viewvc/gnome-python?rev=625&view=rev

Log:
Fixes for the upcoming WAF 1.4.1 (but still also works with WAF 1.3.2)

Modified:
   trunk/ChangeLog
   trunk/bonobo/wscript
   trunk/docs/gnomevfs/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 11:33:16 2008
@@ -46,9 +46,9 @@
         pyext.source = 'bonobomodule.c bonobo.c bonobo-arg.c pybonobo.c'
         pyext.target = '_bonobo'
         pyext.uselib = 'BONOBO'
-        pyext.env.append_value('CPPPATH', '../bonobo') # work around possible WAF bug
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'bonobo')
+        pyext.includes = '.'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'bonobo')
 
         defsdir = Common.install_files('DATADIR', os.path.join('pygtk', '2.0', 'defs'),
                                        ['bonobo.defs',
@@ -59,9 +59,9 @@
         pyext.source = 'activationmodule.c'
         pyext.target = 'activation'
         pyext.uselib = 'BONOBO'
-        pyext.env.append_value('CPPPATH', '../bonobo') # work around possible WAF bug
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'bonobo')
+        pyext.includes = '.'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'bonobo')
 
     
     if bld.env()['ENABLE_BONOBOUI']:
@@ -71,9 +71,9 @@
         pyext.source = 'bonobouimodule.c bonoboui.c'
         pyext.target = 'ui'
         pyext.uselib = 'BONOBOUI'
-        pyext.env.append_value('CPPPATH', '.')
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'bonobo')
+        pyext.includes = '.'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'bonobo')
 
         defsdir = Common.install_files('DATADIR', os.path.join('pygtk', '2.0', 'defs'),
                                        ['bonoboui.defs',

Modified: trunk/docs/gnomevfs/wscript
==============================================================================
--- trunk/docs/gnomevfs/wscript	(original)
+++ trunk/docs/gnomevfs/wscript	Sun May  4 11:33:16 2008
@@ -40,7 +40,7 @@
         cmd.argv = [cmd.input_dir('html', template='--module-dir=%s'),
                     ('--html-dir=%s' % html_dir)]
 
-    html_files = glob.glob(os.path.join(bld.m_curdirnode.find_build('html').abspath(bld.env()), '*'))
-    html_files += glob.glob(os.path.join(bld.m_curdirnode.find_build('html').abspath(), '*'))
+    html_files = glob.glob(os.path.join(bld.m_curdirnode.find_dir('html').abspath(bld.env()), '*'))
+    html_files += glob.glob(os.path.join(bld.m_curdirnode.find_dir('html').abspath(), '*'))
     Common.install_files('DATADIR', os.path.join('gtk-doc', 'html', reference_doc_name),
                          html_files)

Modified: trunk/gconf/wscript
==============================================================================
--- trunk/gconf/wscript	(original)
+++ trunk/gconf/wscript	Sun May  4 11:33:16 2008
@@ -33,9 +33,9 @@
         pyext.source = 'gconfmodule.c gconf.c gconf-fixes.c gconf-types.c'
         pyext.target = 'gconf'
         pyext.uselib = 'GCONF'
-        pyext.env.append_value('CPPPATH', '../gconf') # work around possible WAF bug
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = 'gtk-2.0'
+        pyext.includes = '.'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = 'gtk-2.0'
 
         Common.install_files('DATADIR', os.path.join('pygtk', '2.0', 'defs'),
                              ['gconf.defs'])

Modified: trunk/gnome/wscript
==============================================================================
--- trunk/gnome/wscript	(original)
+++ trunk/gnome/wscript	Sun May  4 11:33:16 2008
@@ -44,8 +44,8 @@
         pyext.source = 'gnomemodule.c gnome.c'
         pyext.target = '_gnome'
         pyext.uselib = 'GNOME'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'gnome')
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'gnome')
 
         defsdir = Common.install_files('DATADIR', os.path.join('pygtk', '2.0', 'defs'),
                                        ['gnome.defs',
@@ -60,9 +60,9 @@
         pyext.source = 'uimodule.c ui.c'
         pyext.target = 'ui'
         pyext.uselib = 'GNOMEUI'
-        pyext.env.append_value('CPPPATH', '../gnomevfs')
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'gnome')
+        pyext.includes = '. ../gnomevfs'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'gnome')
 
     
         defsdir = Common.install_files('DATADIR', os.path.join('pygtk', '2.0', 'defs'),

Modified: trunk/gnomecanvas/wscript
==============================================================================
--- trunk/gnomecanvas/wscript	(original)
+++ trunk/gnomecanvas/wscript	Sun May  4 11:33:16 2008
@@ -38,9 +38,8 @@
         pyext.source = 'canvasmodule.c canvas.c'
         pyext.target = 'gnomecanvas'
         pyext.uselib = 'GNOMECANVAS'
-        #pyext.env.append_value('CPPPATH', '../canvas') # work around possible WAF bug
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = 'gtk-2.0'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = 'gtk-2.0'
 
         defsdir = Common.install_files('DATADIR', os.path.join('pygtk', '2.0', 'defs'),
                                        ['canvas.defs'])

Modified: trunk/gnomevfs/wscript
==============================================================================
--- trunk/gnomevfs/wscript	(original)
+++ trunk/gnomevfs/wscript	Sun May  4 11:33:16 2008
@@ -35,27 +35,27 @@
 '''
         pyext.target = '_gnomevfs'
         pyext.uselib = 'GNOMEVFS'
-        pyext.env.append_value('CPPPATH', '../gnomevfs') # work around possible WAF bug
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = vfsdir
+        pyext.includes = '.'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = vfsdir
 
     if bld.env()['ENABLE_GNOMEVFSBONOBO']:
         pyext = bld.create_obj('cc', 'plugin', 'pyext')
         pyext.source = 'vfsbonobomodule.c'
         pyext.target = 'gnomevfsbonobo'
         pyext.uselib = 'GNOMEVFSBONOBO'
-        pyext.env.append_value('CPPPATH', '../gnomevfs') # work around possible WAF bug
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = vfsdir
+        pyext.includes = '.'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = vfsdir
 
     if bld.env()['ENABLE_GNOMEVFSMODULE']:
         pyembed = bld.create_obj('cc', 'plugin', 'pyembed')
         pyembed.source = 'gnome-vfs-python-method.c'
         pyembed.target = 'pythonmethod'
         pyembed.uselib = 'GNOMEVFSMODULE'
-        pyembed.env.append_value('CPPPATH', '../gnomevfs') # work around possible WAF bug
-        pyembed.install_var = 'LIBDIR'
-        pyembed.install_subdir = os.path.join('gnome-vfs-2.0', 'modules')
+        pyembed.includes = '.'
+        pyembed.inst_var = 'LIBDIR'
+        pyembed.inst_dir = os.path.join('gnome-vfs-2.0', 'modules')
 
         vfsmethoddir = os.path.join(pyembed.env['LIBDIR'], 'gnome-vfs-2.0', 'modules')
         pyembed.env.append_value('CCDEFINES', 'GNOME_VFS_PYTHON_DIR="\\"%s\\""' % vfsmethoddir)

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sun May  4 11:33:16 2008
@@ -78,8 +78,8 @@
         'datarootdir': bld.env()['DATADIR'],
         }
     obj.fun = misc.subst_func
-    obj.install_var = 'LIBDIR'
-    obj.install_subdir = 'pkgconfig'
+    obj.inst_var = 'LIBDIR'
+    obj.inst_dir = 'pkgconfig'
 
     ## subdirs
     bld.add_subdirs('bonobo')