GNOME.org
 

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

Author: gjc
Date: Sun May  4 11:23:49 2008
New Revision: 484
URL: http://svn.gnome.org/viewvc/gnome-python-desktop?rev=484&view=rev

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

Modified:
   trunk/ChangeLog
   trunk/docs/gnomeprint/wscript
   trunk/docs/gnomeprintui/wscript
   trunk/docs/gtksourceview/wscript
   trunk/evolution/wscript
   trunk/gnomeapplet/wscript
   trunk/gnomedesktop/wscript
   trunk/gnomekeyring/wscript
   trunk/gnomeprint/wscript
   trunk/gtksourceview/wscript
   trunk/gtop/ChangeLog
   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/docs/gnomeprint/wscript
==============================================================================
--- trunk/docs/gnomeprint/wscript	(original)
+++ trunk/docs/gnomeprint/wscript	Sun May  4 11:23:49 2008
@@ -37,7 +37,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/docs/gnomeprintui/wscript
==============================================================================
--- trunk/docs/gnomeprintui/wscript	(original)
+++ trunk/docs/gnomeprintui/wscript	Sun May  4 11:23:49 2008
@@ -38,7 +38,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/docs/gtksourceview/wscript
==============================================================================
--- trunk/docs/gtksourceview/wscript	(original)
+++ trunk/docs/gtksourceview/wscript	Sun May  4 11:23:49 2008
@@ -38,7 +38,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/evolution/wscript
==============================================================================
--- trunk/evolution/wscript	(original)
+++ trunk/evolution/wscript	Sun May  4 11:23:49 2008
@@ -39,14 +39,14 @@
     evolution_common = bld.create_obj('cc', 'objects', 'pyext')
     evolution_common.name = 'evolution_common'
     evolution_common.source = 'override_common.c'
-    evolution_common.env.append_value('CPPPATH', '../evolution') # work around possible WAF bug
+    evolution_common.includes = '.'
     evolution_common.uselib = 'PYGTK'
     evolution_common.env.append_value('CCFLAGS', evolution_common.env['shlib_CCFLAGS'])
     
     if bld.env()['ENABLE_EVOLUTION_EBOOK']:
         codegen(bld, 'ebook')
         pyext = bld.create_obj('cc', 'plugin', 'pyext')
-        pyext.env.append_value('CPPPATH', '../evolution') # work around possible WAF bug
+        pyext.includes = '.'
         pyext.source = '''
 	ebookmodule.c
 	ebook.c
@@ -58,13 +58,13 @@
         pyext.add_objects = 'evolution_common'
         pyext.target = 'ebook'
         pyext.uselib = 'EVOLUTION_EBOOK'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'evolution')
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'evolution')
 
     if bld.env()['ENABLE_EVOLUTION_ECAL']:
         codegen(bld, 'ecal')
         pyext = bld.create_obj('cc', 'plugin', 'pyext')
-        pyext.env.append_value('CPPPATH', '../evolution') # work around possible WAF bug
+        pyext.includes = '.'
         pyext.source = '''
 	ecalmodule.c
 	ecal.c
@@ -74,8 +74,8 @@
         pyext.add_objects = 'evolution_common'
         pyext.target = 'ecal'
         pyext.uselib = 'EVOLUTION_ECAL'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'evolution')
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'evolution')
 
     py = bld.create_obj('py')
     py.inst_dir = os.path.join('gtk-2.0', 'evolution')

Modified: trunk/gnomeapplet/wscript
==============================================================================
--- trunk/gnomeapplet/wscript	(original)
+++ trunk/gnomeapplet/wscript	Sun May  4 11:23:49 2008
@@ -38,8 +38,8 @@
         pyext.source = 'appletmodule.c applet.c'
         pyext.target = 'gnomeapplet'
         pyext.uselib = 'GNOMEAPPLET'
-        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'),
                                        ['applet.defs'])

Modified: trunk/gnomedesktop/wscript
==============================================================================
--- trunk/gnomedesktop/wscript	(original)
+++ trunk/gnomedesktop/wscript	Sun May  4 11:23:49 2008
@@ -35,8 +35,8 @@
         pyext.source = '_gnomedesktopmodule.c _gnomedesktop.c'
         pyext.target = '_gnomedesktop'
         pyext.uselib = 'GNOMEDESKTOP'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'gnomedesktop')
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'gnomedesktop')
 
         py = bld.create_obj('py')
         py.inst_dir = os.path.join('gtk-2.0', 'gnomedesktop')

Modified: trunk/gnomekeyring/wscript
==============================================================================
--- trunk/gnomekeyring/wscript	(original)
+++ trunk/gnomekeyring/wscript	Sun May  4 11:23:49 2008
@@ -41,8 +41,8 @@
         pyext.source = 'gnomekeyringmodule.c gnomekeyring.c'
         pyext.target = 'gnomekeyring'
         pyext.uselib = 'GNOMEKEYRING'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = 'gtk-2.0'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_subdir = 'gtk-2.0'
 
         defsdir = Common.install_files('DATADIR', os.path.join('pygtk', '2.0', 'defs'),
                                        ['gnomekeyring.defs'])

Modified: trunk/gnomeprint/wscript
==============================================================================
--- trunk/gnomeprint/wscript	(original)
+++ trunk/gnomeprint/wscript	Sun May  4 11:23:49 2008
@@ -40,9 +40,9 @@
         pyext.source = 'printmodule.c print.c art-gtype.c'
         pyext.target = '_print'
         pyext.uselib = 'GNOMEPRINT'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'gnomeprint')
-        pyext.env.append_value('CPPPATH', '../gnomeprint') # work around possible WAF bug
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'gnomeprint')
+        pyext.includes = '.'
 
     if bld.env()['ENABLE_GNOMEPRINTUI']:
         codegen(bld, 'printui')
@@ -50,9 +50,9 @@
         pyext.source = 'printuimodule.c printui.c'
         pyext.target = 'ui'
         pyext.uselib = 'GNOMEPRINTUI'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'gnomeprint')
-        pyext.env.append_value('CPPPATH', '../gnomeprint') # work around possible WAF bug
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'gnomeprint')
+        pyext.includes = '.'
 
     py = bld.create_obj('py')
     py.inst_dir = os.path.join('gtk-2.0', 'gnomeprint')

Modified: trunk/gtksourceview/wscript
==============================================================================
--- trunk/gtksourceview/wscript	(original)
+++ trunk/gtksourceview/wscript	Sun May  4 11:23:49 2008
@@ -36,8 +36,8 @@
         pyext.source = 'gtksourceviewmodule.c gtksourceview.c'
         pyext.target = 'gtksourceview'
         pyext.uselib = 'GTKSOURCEVIEW'
-        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'),
                                        ['gtksourceview.defs'])

Modified: trunk/gtop/wscript
==============================================================================
--- trunk/gtop/wscript	(original)
+++ trunk/gtop/wscript	Sun May  4 11:23:49 2008
@@ -14,6 +14,6 @@
         pyext.source = 'gtop.c'
         pyext.target = 'gtop'
         pyext.uselib = 'GTOP'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = 'gtk-2.0'
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = 'gtk-2.0'
 

Modified: trunk/mediaprofiles/wscript
==============================================================================
--- trunk/mediaprofiles/wscript	(original)
+++ trunk/mediaprofiles/wscript	Sun May  4 11:23:49 2008
@@ -35,8 +35,8 @@
         pyext.source = 'mediaprofilesmodule.c mediaprofiles.c'
         pyext.target = 'mediaprofiles'
         pyext.uselib = 'MEDIAPROFILES'
-        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'),
                                        ['mediaprofiles.defs'])

Modified: trunk/metacity/wscript
==============================================================================
--- trunk/metacity/wscript	(original)
+++ trunk/metacity/wscript	Sun May  4 11:23:49 2008
@@ -47,8 +47,8 @@
         pyext.source = 'metacitymodule.c metacity.c'
         pyext.target = 'metacity'
         pyext.uselib = 'METACITY'
-        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'),
                                        ['metacity.defs'])

Modified: trunk/nautilusburn/wscript
==============================================================================
--- trunk/nautilusburn/wscript	(original)
+++ trunk/nautilusburn/wscript	Sun May  4 11:23:49 2008
@@ -33,11 +33,11 @@
         codegen(bld, 'nautilus_burn')
         pyext = bld.create_obj('cc', 'plugin', 'pyext')
         pyext.source = 'nb_module.c nautilus_burn.c nb_track.c'
-        pyext.env.append_value('CPPPATH', '../nautilusburn') # work around possible WAF bug
+        pyext.includes = '.'
         pyext.target = 'nautilusburn'
         pyext.uselib = 'NAUTILUSBURN'
-        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'),
                                        ['nautilus_burn.defs'])

Modified: trunk/rsvg/wscript
==============================================================================
--- trunk/rsvg/wscript	(original)
+++ trunk/rsvg/wscript	Sun May  4 11:23:49 2008
@@ -35,8 +35,8 @@
         pyext.source = 'rsvgmodule.c rsvg.c'
         pyext.target = 'rsvg'
         pyext.uselib = 'RSVG'
-        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'),
                                        ['rsvg.defs'])

Modified: trunk/totem/wscript
==============================================================================
--- trunk/totem/wscript	(original)
+++ trunk/totem/wscript	Sun May  4 11:23:49 2008
@@ -35,8 +35,8 @@
         pyext.source = 'plparsermodule.c plparser.c'
         pyext.target = 'plparser'
         pyext.uselib = 'PLPARSER'
-        pyext.install_var = 'PYTHONDIR'
-        pyext.install_subdir = os.path.join('gtk-2.0', 'totem')
+        pyext.inst_var = 'PYTHONDIR'
+        pyext.inst_dir = os.path.join('gtk-2.0', 'totem')
 
         py = bld.create_obj('py')
         py.inst_dir = os.path.join('gtk-2.0', 'totem')

Modified: trunk/wnck/wscript
==============================================================================
--- trunk/wnck/wscript	(original)
+++ trunk/wnck/wscript	Sun May  4 11:23:49 2008
@@ -36,8 +36,8 @@
         pyext.source = 'wnckmodule.c wnck.c'
         pyext.target = 'wnck'
         pyext.uselib = 'WNCK'
-        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'),
                                        ['wnck.defs'])

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sun May  4 11:23:49 2008
@@ -95,8 +95,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('gnomekeyring')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]