SVN commit 590793 by tnagy:

Code cleanup, fewer TODOs.


 M  +0 -2      Build.py  
 M  +1 -1      Params.py  
 M  +0 -2      Scan.py  
 M  +2 -10     Task.py  
 M  +1 -4      Tools/KDE3.py  
 M  +2 -10     Tools/Tex.py  
 M  +2 -6      Tools/gnome.py  


--- trunk/playground/devtools/waf/wafadmin/Build.py #590792:590793
@@ -362,8 +362,6 @@
 	def needs_rescan(self, node, env):
 		"tell if a node has changed, to update the cache"
 		#print "needs_rescan for ", node, node.m_tstamp
-		#if node in node.m_parent.m_files: variant = 0
-		#else: variant = env.variant()
 		variant = node.variant(env)
 		try:
 			if self.m_deps_tstamp[variant][node] == self.m_tstamp_variants[variant][node]:
--- trunk/playground/devtools/waf/wafadmin/Params.py #590792:590793
@@ -25,7 +25,7 @@
 g_excludes = ['.svn', 'CVS', 'wafadmin', '.arch-ids']
 "exclude from dist"
 
-g_strong_hash = 1
+g_strong_hash = 0
 "hash method: md5 (1:default) or integers"
 
 g_timestamp = 0
--- trunk/playground/devtools/waf/wafadmin/Scan.py #590792:590793
@@ -86,7 +86,6 @@
 		variant = task.m_inputs[0].variant(env)
 		def add_node_sig(node):
 			if not node: print "warning: null node in get_node_sig"
-			#if node in seen: return
 			seen.append(node.m_name)
 
 			# rescan if necessary, and add the signatures of the nodes it depends on
@@ -114,7 +113,6 @@
 		variant = task.m_inputs[0].variant(env)
 		def add_node_sig(node):
 			if not node: print "warning: null node in get_node_sig"
-			#if node in seen: return 0
 
 			sum = 0
 			seen.append(node.m_name)
--- trunk/playground/devtools/waf/wafadmin/Task.py #590792:590793
@@ -157,10 +157,7 @@
 
 		cnt = 0
 		for node in self.m_outputs:
-			#TODO: fix this
-			if node in node.m_parent.files(): variant = 0
-			#if node.m_parent.get_file(node.m_name): variant = 0
-			else: variant = self.m_env.variant()
+			variant = node.variant(env)
 			#if node in tree.m_tstamp_variants[variant]:
 			#	print "variant is ", variant
 			#	print "self sig is ", Params.vsig(tree.m_tstamp_variants[variant][node])
@@ -214,8 +211,6 @@
 
 		# TODO should make a for loop as the first node is not enough
 		variant = node.variant(self.m_env)
-		#if node in node.m_parent.files(): variant = 0
-		#else: variant = self.m_env.variant()
 
 		if not node in Params.g_build.m_tstamp_variants[variant]:
 			#debug("task should run as the first node does not exist"+str(node))
@@ -256,10 +251,7 @@
 		try:
 			cnt = 0
 			for node in self.m_outputs:
-				#TODO: also fix this
-				if node in node.m_parent.files(): variant = 0
-				#if node.m_parent.get_file(node.m_name): variant = 0
-				else: variant = env.variant()
+				variant = node.variant(env)
 
 				ssig = sig.encode('hex')
 				orig = os.path.join(Params.g_options.usecache, ssig+'-'+str(cnt))
--- trunk/playground/devtools/waf/wafadmin/Tools/KDE3.py #590792:590793
@@ -180,10 +180,7 @@
 		hash = {'path_lst': self.dir_lst['path_lst']}
 		g_kcfg_scanner.do_scan(node, self.env, hashparams=hash)
 
-	#TODO: fix this
-	if node in node.m_parent.files(): variant = 0
-	else: variant = self.env.variant()
-
+	variant = node.variant(self.env)
 	kcfg_node = tree.m_depends_on[variant][node][0]
 	cppnode = node.change_ext('.cpp')
 
--- trunk/playground/devtools/waf/wafadmin/Tools/Tex.py #590792:590793
@@ -14,10 +14,7 @@
 	def __init__(self):
 		Scan.scanner.__init__(self)
 	def scan(self, node, env, curdirnode):
-		#TODO: fix this
-		if node in node.m_parent.files(): variant = 0
-		else: variant = env.variant()
-
+		variant = node.variant(env)
 		fi = open(node.abspath(env), 'r')
 		content = fi.read()
 		fi.close()
@@ -237,12 +234,7 @@
 
 			# add the manual dependencies
 			if deps_lst:
-				#TODO: fix this
-				if node in node.m_parent.files(): 
-					variant = 0
-				else: 
-					variant = self.env.variant()
-
+				variant = node.variant(self.env)
 				outnode = task.m_outputs[0]
 				try:
 					lst = tree.m_depends_on[variant][node]
--- trunk/playground/devtools/waf/wafadmin/Tools/gnome.py #590792:590793
@@ -16,9 +16,7 @@
 	def __init__(self):
 		Scan.scanner.__init__(self)
 	def scan(self, node, env):
-		#TODO: fix this
-		if node in node.m_parent.files(): variant = 0
-		else: variant = env.variant()
+		variant = node.variant(env)
 
 		fi = open(node.abspath(env), 'r')
 		content = fi.read()
@@ -88,9 +86,7 @@
 				if tree.needs_rescan(node, self.env):
 					sgml_scanner.do_scan(node, self.env, hashparams={})
 
-				#TODO: fix this
-				if node in node.m_parent.files(): variant = 0
-				else: variant = self.env.variant()
+				variant = node.variant(self.env)
 
 				try: tmp_lst = tree.m_raw_deps[variant][node]
 				except: tmp_lst = []