[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/waf
From:       Thomas Nagy <tnagyemail-mail () yahoo ! fr>
Date:       2006-10-22 0:12:48
Message-ID: 1161475968.088561.25794.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 597906 by tnagy:

Typo sources->source
Python 2.5 warnings on exceptions


 M  +2 -2      demos/gnome/data/wscript_build  
 M  +1 -2      demos/qt3/wscript  
 M  +5 -5      wafadmin/Configure.py  
 M  +2 -2      wafadmin/Tools/gnome.py  


--- trunk/playground/devtools/waf/demos/gnome/data/wscript_build #597905:597906
@@ -5,14 +5,14 @@
 # process .in files with intl_tool
 
 obj=bld.create_obj('gnome_intltool')
-obj.sources = 'gnome_test.schemas.in'
+obj.source  = 'gnome_test.schemas.in'
 obj.destvar = 'PREFIX'
 obj.subdir  = 'etc/gconf/schemas'
 obj.podir   = '../po'
 obj.flags   = '-s'
 
 obj=bld.create_obj('gnome_intltool')
-obj.sources = 'gnome_test.desktop.in'
+obj.source  = 'gnome_test.desktop.in'
 obj.destvar = 'PREFIX'
 obj.subdir  = 'usr/share/gnome/autostart'
 obj.podir   = '../po'
--- trunk/playground/devtools/waf/demos/qt3/wscript #597905:597906
@@ -13,8 +13,7 @@
 	opt.tool_options('Qt3')
 
 def configure(conf):
-	conf.check_tool('g++')
-	conf.check_tool('Qt3')
+	conf.check_tool('g++ Qt3')
 
 def build(bld):
 	obj = bld.create_obj('qt3', 'program')
--- trunk/playground/devtools/waf/wafadmin/Configure.py #597905:597906
@@ -357,7 +357,7 @@
 
 		try:
 			ret = os.popen('%s %s 2>/dev/null' % (self.binary, self.tests.keys()[0] )).close()
-			if ret: raise "error"
+			if ret: raise ValueError, "error"
 
 			for flag in self.tests:
 				var = self.tests[flag] + '_' + self.uselib
@@ -365,7 +365,7 @@
 				retval[var] = [os.popen(cmd).read().strip()]
 
 			self.update_env(retval)
-		except:
+		except ValueError:
 			retval = {}
 			found = 0
 
@@ -445,12 +445,12 @@
 			if self.version:
 				ret = os.popen("%s --atleast-version=%s %s" % (pkgcom, self.version, self.name)).close()
 				self.conf.check_message('package %s >= %s' % (self.name, self.version), '', not ret)
-				if ret: raise "error"
+				if ret: raise ValueError, "error"
 			else:
 				ret = os.popen("%s %s" % (pkgcom, self.name)).close()
 				self.conf.check_message('package %s' % (self.name), '', not ret)
 				if ret:
-					raise "error"
+					raise ValueError, "error"
 
 			retval['CCFLAGS_'+uselib]   = [os.popen('%s --cflags %s' % (pkgcom, self.name)).read().strip()]
 			retval['CXXFLAGS_'+uselib]  = [os.popen('%s --cflags %s' % (pkgcom, self.name)).read().strip()]
@@ -486,7 +486,7 @@
 
 			self.conf.add_define(self.define, 1)
 			self.update_env(retval)
-		except:
+		except ValueError:
 			retval = {}
 			self.conf.add_define(self.define, 0)
 
--- trunk/playground/devtools/waf/wafadmin/Tools/gnome.py #597905:597906
@@ -38,7 +38,7 @@
 class gnome_intltool(Object.genobj):
 	def __init__(self):
 		Object.genobj.__init__(self, 'other')
-		self.sources = ''
+		self.source  = ''
 		self.destvar = ''
 		self.subdir  = ''
 		self.flags   = ''
@@ -49,7 +49,7 @@
 		self.env = self.env.copy()
 		tree = Params.g_build
 		current = tree.m_curdirnode
-		for i in self.sources.split():
+		for i in self.to_list(self.source):
 			node = self.m_current_path.find_node(
 				Utils.split_path(i))
 
[prev in list] [next in list] [prev in thread] [next in thread]