Upgrade waf to 1.5.10

Author: ry

tools/waf-light

@@ -37,7 +37,7 @@ if 'PSYCOWAF' in os.environ:
 	try:import psyco;psyco.full()
 	except:pass
 
-VERSION="1.5.9"
+VERSION="1.5.10"
 REVISION="x"
 INSTALL="x"
 C1='x'
@@ -75,8 +75,11 @@ def unpack_wafdir(dir):
 	import shutil, tarfile
 	try: shutil.rmtree(dir)
 	except OSError: pass
-	try: os.makedirs(join(dir, 'wafadmin', 'Tools'))
-	except OSError: err("Cannot unpack waf lib into %s\nMove waf into a writeable directory" % dir)
+	try:
+		for x in ['Tools', '3rdparty']:
+			os.makedirs(join(dir, 'wafadmin', x))
+	except OSError:
+		err("Cannot unpack waf lib into %s\nMove waf into a writeable directory" % dir)
 
 	os.chdir(dir)
 	tmp = 't.tbz2'
@@ -94,7 +97,8 @@ def unpack_wafdir(dir):
 		except OSError: pass
 		err("Waf cannot be unpacked, check that bzip2 support is present")
 
-	os.chmod(join('wafadmin','Tools'), 493)
+	for x in ['Tools', '3rdparty']:
+		os.chmod(join('wafadmin',x), 493)
 
 	os.unlink(tmp)
 
@@ -142,7 +146,8 @@ def find_lib():
 wafdir = find_lib()
 w = join(wafdir, 'wafadmin')
 t = join(w, 'Tools')
-sys.path = [w, t] + sys.path
+f = join(w, '3rdparty')
+sys.path = [w, t, f] + sys.path
 
 import Scripting
 Scripting.prepare(t, cwd, VERSION, wafdir)

tools/wafadmin/Tools/boost.py tools/wafadmin/3rdparty/boost.pytools/wafadmin/Tools/boost.py renamed to tools/wafadmin/3rdparty/boost.py

@@ -0,0 +1,27 @@
+#!/usr/bin/python
+# encoding: utf-8
+# Grygoriy Fuchedzhy 2009
+
+"""
+Compile fluid files (fltk graphic library). Use the 'fluid' feature in conjuction with the 'cxx' feature.
+"""
+
+import Task
+from TaskGen import extension
+
+Task.simple_task_type('fluid', '${FLUID} -c -o ${TGT[0].abspath(env)} -h ${TGT[1].abspath(env)} ${SRC}', 'BLUE', shell=False, ext_out='.cxx')
+
+@extension('.fl')
+def fluid(self, node):
+	"""add the .fl to the source list; the cxx file generated will be compiled when possible"""
+	cpp = node.change_ext('.cpp')
+	hpp = node.change_ext('.hpp')
+	self.create_task('fluid', node, [cpp, hpp])
+
+	if 'cxx' in self.features:
+		self.allnodes.append(cpp)
+
+def detect(conf):
+    fluid = conf.find_program('fluid', var='FLUID', mandatory=True)
+    conf.check_cfg(path='fltk-config', package='', args='--cxxflags --ldflags', uselib_store='FLTK', mandatory=True)
+

tools/wafadmin/3rdparty/fluid.py

@@ -57,8 +57,10 @@ def f(*k, **kw):
 			postpone = kw['postpone']
 			del kw['postpone']
 
+		# TODO waf 1.6 in theory there should be no reference to the TaskManager internals here
 		if postpone:
 			m = k[0].task_manager
+			if not m.groups: m.add_group()
 			m.groups[m.current_group].post_funs.append((fun, k, kw))
 			kw['cwd'] = k[0].path
 		else:
@@ -801,6 +803,9 @@ def install_files(self, path, files, env=None, chmod=O644, relative_trick=False,
 		else:
 			lst = Utils.to_list(files)
 
+		if not getattr(lst, '__iter__', False):
+			lst = [lst]
+
 		destpath = self.get_install_path(path, env)
 
 		Utils.check_dir(destpath)

tools/wafadmin/Build.py

@@ -9,9 +9,9 @@
 """
 
 # do not touch these three lines, they are updated automatically
-HEXVERSION = 0x10509
-WAFVERSION="1.5.9"
-WAFREVISION = "6626:6639M"
+HEXVERSION = 0x105010
+WAFVERSION="1.5.10"
+WAFREVISION = "6794M"
 ABI = 7
 
 # permissions

tools/wafadmin/Constants.py

@@ -86,7 +86,7 @@ def detach(self):
 		else:
 			keys = tbl.keys()
 			for x in keys:
-				tbl[x] = copy.copy(tbl[x])
+				tbl[x] = copy.deepcopy(tbl[x])
 			self.table = tbl
 
 	def get_flat(self, key):

tools/wafadmin/Environment.py

@@ -2,6 +2,7 @@
 # encoding: utf-8
 # Thomas Nagy, 2005 (ita)
 
+import ansiterm
 import os, re, logging, traceback, sys
 from Constants import *
 
@@ -11,7 +12,7 @@
 colors_lst = {
 'USE' : True,
 'BOLD'  :'\x1b[01;1m',
-'RED'   :'\x1b[01;91m',
+'RED'   :'\x1b[01;31m',
 'GREEN' :'\x1b[32m',
 'YELLOW':'\x1b[33m',
 'PINK'  :'\x1b[35m',
@@ -31,9 +32,13 @@
 
 import Utils
 
-if not got_tty or sys.platform == 'win32' or 'NOCOLOR' in os.environ:
+if not got_tty or 'NOCOLOR' in os.environ:
 	colors_lst['USE'] = False
 
+# test
+#if sys.platform == 'win32':
+#	colors_lst['USE'] = True
+
 def get_color(cl):
 	if not colors_lst['USE']: return ''
 	return colors_lst.get(cl, '')

tools/wafadmin/Logs.py

@@ -6,15 +6,15 @@
 Node: filesystem structure, contains lists of nodes
 
 IMPORTANT:
-1. Each file/folder is represented by exactly one node
+1. Each file/folder is represented by exactly one node.
 
 2. Most would-be class properties are stored in Build: nodes to depend on, signature, flags, ..
-unused class members increase the .wafpickle file size sensibly with lots of objects
+unused class members increase the .wafpickle file size sensibly with lots of objects.
 
-3. The build is launched from the top of the build dir (for example, in _build_/)
+3. The build is launched from the top of the build dir (for example, in _build_/).
 
 4. Node should not be instantiated directly.
-Each instance of Build.BuildContext has a Node sublass.
+Each instance of Build.BuildContext has a Node subclass.
 (aka: 'Nodu', see BuildContext initializer)
 The BuildContext is referenced here as self.__class__.bld
 Its Node class is referenced here as self.__class__

tools/wafadmin/Node.py

@@ -27,7 +27,7 @@ def prepare_impl(t, cwd, ver, wafdir):
 	# now find the wscript file
 	msg1 = 'Waf: Please run waf from a directory containing a file named "%s" or run distclean' % WSCRIPT_FILE
 
-	# in theory projects can be configured in a gcc manner:
+	# in theory projects can be configured in an autotool-like manner:
 	# mkdir build && cd build && ../waf configure && ../waf
 	build_dir_override = None
 	candidate = None
@@ -39,7 +39,7 @@ def prepare_impl(t, cwd, ver, wafdir):
 		candidate = cwd
 
 	elif 'configure' in sys.argv and not WSCRIPT_BUILD_FILE in lst:
-		# gcc-like configuration
+		# autotool-like configuration
 		calldir = os.path.abspath(os.path.dirname(sys.argv[0]))
 		if WSCRIPT_FILE in os.listdir(calldir):
 			candidate = calldir
@@ -60,7 +60,10 @@ def prepare_impl(t, cwd, ver, wafdir):
 			break
 		if Options.lockfile in dirlst:
 			env = Environment.Environment()
-			env.load(os.path.join(cwd, Options.lockfile))
+			try:
+				env.load(os.path.join(cwd, Options.lockfile))
+			except:
+				error('could not load %r' % Options.lockfile)
 			try:
 				os.stat(env['cwd'])
 			except:

tools/wafadmin/Scripting.py

@@ -569,7 +569,7 @@ def set_run_after(self, task):
 
 	def add_file_dependency(self, filename):
 		"TODO user-provided file dependencies"
-		node = self.generator.bld.current.find_resource(filename)
+		node = self.generator.bld.path.find_resource(filename)
 		self.deps_nodes.append(node)
 
 	def signature(self):