Commits

Anonymous committed 270cad8

cleanup for waf 1.7

Comments (0)

Files changed (3)

waflib/Tools/c.py

 	ext_in  = ['.h'] # set the build order easily by using ext_out=['.h']
 	scan    = c_preproc.scan
 
-Task.classes['cc'] = cc = c # compat, remove in waf 1.7
-
 class cprogram(link_task):
 	"Link object files into a c program"
 	run_str = '${LINK_CC} ${LINKFLAGS} ${CCLNK_SRC_F}${SRC} ${CCLNK_TGT_F}${TGT[0].abspath()} ${RPATH_ST:RPATH} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${FRAMEWORK_ST:FRAMEWORK} ${ARCH_ST:ARCH} ${STLIB_MARKER} ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} ${SHLIB_MARKER} ${LIBPATH_ST:LIBPATH} ${LIB_ST:LIB}'

waflib/Tools/fc.py

 				for t in outs[k]:
 					tmp.extend(t.outputs)
 				a.dep_nodes.extend(tmp)
-
-				# old python versions
-				try:
-					a.dep_nodes.sort(key=lambda x: x.abspath())
-				except:
-					a.dep_nodes.sort(lambda x, y: cmp(x.abspath(), y.abspath()))
+				a.dep_nodes.sort(key=lambda x: x.abspath())
 
 		# the task objects have changed: clear the signature cache
 		for tsk in lst:

waflib/Tools/msvc.py

 	def fun(tup):
 		return tup[0]
 
-	try:
-		detected_versions.sort(key = fun)
-	except:
-		# old python sort
-		detected_versions.sort(lambda x,y: cmp(x[0], y[0]))
+	detected_versions.sort(key = fun)
 	return detected_versions
 
 @conf