Squashed 'waflib/' changes from 6e726eb..5ea8f99

5ea8f99 Improve test output spacing
0e23b29 Raise exception when test suite fails to ensure non-zero exit status
d6de073 Show run time of unit tests
5b65554 Add short configure option for ultra-strict flags
4687ba6 Use gtest-like test output
258903d Fix failure count in test group summaries
da07e73 Fix verbose tests with Python 3

git-subtree-dir: waflib
git-subtree-split: 5ea8f99f6e1246079c1fe6bb590c38a53aadd40d

1 files changed, 0 insertions, 300 deletions

diff --git a/waflib/extras/ticgt.py b/waflib/extras/ticgt.py
deleted file mode 100644
index f43a7ea..0000000
--- a/waflib/extras/ticgt.py
+++ /dev/null
@@ -1,300 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-
-# Texas Instruments code generator support (experimental)
-# When reporting issues, please directly assign the bug to the maintainer.
-
-__author__ = __maintainer__ = "Jérôme Carretero <cJ-waf@zougloub.eu>"
-__copyright__ = "Jérôme Carretero, 2012"
-
-"""
-TI cgt6x is a compiler suite for TI DSPs.
-
-The toolchain does pretty weird things, and I'm sure I'm missing some of them.
-But still, the tool saves time.
-
-What this tool does is:
-
-- create a TI compiler environment
-- create TI compiler features, to handle some specifics about this compiler
-  It has a few idiosyncracies, such as not giving the liberty of the .o file names
-- automatically activate them when using the TI compiler
-- handle the tconf tool
-  The tool
-
-TODO:
-
-- the set_platform_flags() function is not nice
-- more tests
-- broaden tool scope, if needed
-
-"""
-
-import os, re
-
-from waflib import Options, Utils, Task, TaskGen
-from waflib.Tools import c, ccroot, c_preproc
-from waflib.Configure import conf
-from waflib.TaskGen import feature, before_method
-from waflib.Tools.c import cprogram
-
-opj = os.path.join
-
-@conf
-def find_ticc(conf):
-	conf.find_program(['cl6x'], var='CC', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
-	conf.env.CC_NAME = 'ticc'
-
-@conf
-def find_tild(conf):
-	conf.find_program(['lnk6x'], var='LINK_CC', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
-	conf.env.LINK_CC_NAME = 'tild'
-
-@conf
-def find_tiar(conf):
-	conf.find_program(['ar6x'], var='AR', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
-	conf.env.AR_NAME = 'tiar'
-	conf.env.ARFLAGS = 'qru'
-
-@conf
-def ticc_common_flags(conf):
-	v = conf.env
-
-	if not v['LINK_CC']:
-		v['LINK_CC'] = v['CC']
-	v['CCLNK_SRC_F']	 = []
-	v['CCLNK_TGT_F']	 = ['-o']
-	v['CPPPATH_ST']	  = '-I%s'
-	v['DEFINES_ST']	  = '-d%s'
-
-	v['LIB_ST']	      = '-l%s' # template for adding libs
-	v['LIBPATH_ST']	  = '-i%s' # template for adding libpaths
-	v['STLIB_ST']	    = '-l=%s.lib'
-	v['STLIBPATH_ST']	= '-i%s'
-
-	# program
-	v['cprogram_PATTERN']    = '%s.out'
-
-	# static lib
-	#v['LINKFLAGS_cstlib']    = ['-Wl,-Bstatic']
-	v['cstlib_PATTERN']      = '%s.lib'
-
-def configure(conf):
-	v = conf.env
-	v.TI_CGT_DIR = getattr(Options.options, 'ti-cgt-dir', "")
-	v.TI_DSPLINK_DIR = getattr(Options.options, 'ti-dsplink-dir', "")
-	v.TI_BIOSUTILS_DIR = getattr(Options.options, 'ti-biosutils-dir', "")
-	v.TI_DSPBIOS_DIR = getattr(Options.options, 'ti-dspbios-dir', "")
-	v.TI_XDCTOOLS_DIR = getattr(Options.options, 'ti-xdctools-dir', "")
-	conf.find_ticc()
-	conf.find_tiar()
-	conf.find_tild()
-	conf.ticc_common_flags()
-	conf.cc_load_tools()
-	conf.cc_add_flags()
-	conf.link_add_flags()
-	conf.find_program(['tconf'], var='TCONF', path_list=v.TI_XDCTOOLS_DIR)
-
-	conf.env.TCONF_INCLUDES += [
-	 opj(conf.env.TI_DSPBIOS_DIR, 'packages'),
-	]
-
-	conf.env.INCLUDES += [
-	 opj(conf.env.TI_CGT_DIR, 'include'),
-	]
-
-	conf.env.LIBPATH += [
-	 opj(conf.env.TI_CGT_DIR, "lib"),
-	]
-
-	conf.env.INCLUDES_DSPBIOS += [
-	 opj(conf.env.TI_DSPBIOS_DIR, 'packages', 'ti', 'bios', 'include'),
-	]
-
-	conf.env.LIBPATH_DSPBIOS += [
-	 opj(conf.env.TI_DSPBIOS_DIR, 'packages', 'ti', 'bios', 'lib'),
-	]
-
-	conf.env.INCLUDES_DSPLINK += [
-	 opj(conf.env.TI_DSPLINK_DIR, 'dsplink', 'dsp', 'inc'),
-	]
-
-@conf
-def ti_set_debug(cfg, debug=1):
-	"""
-	Sets debug flags for the compiler.
-
-	TODO:
-	- for each TI CFLAG/INCLUDES/LINKFLAGS/LIBPATH replace RELEASE by DEBUG
-	- -g --no_compress
-	"""
-	if debug:
-		cfg.env.CFLAGS += "-d_DEBUG -dDEBUG -dDDSP_DEBUG".split()
-
-@conf
-def ti_dsplink_set_platform_flags(cfg, splat, dsp, dspbios_ver, board):
-	"""
-	Sets the INCLUDES, LINKFLAGS for DSPLINK and TCONF_INCLUDES
-	For the specific hardware.
-
-	Assumes that DSPLINK was built in its own folder.
-
-	:param splat: short platform name (eg. OMAPL138)
-	:param dsp: DSP name (eg. 674X)
-	:param dspbios_ver: string identifying DspBios version (eg. 5.XX)
-	:param board: board name (eg. OMAPL138GEM)
-
-	"""
-	d1 = opj(cfg.env.TI_DSPLINK_DIR, 'dsplink', 'dsp', 'inc', 'DspBios', dspbios_ver)
-	d = opj(cfg.env.TI_DSPLINK_DIR, 'dsplink', 'dsp', 'inc', 'DspBios', dspbios_ver, board)
-	cfg.env.TCONF_INCLUDES += [d1, d]
-	cfg.env.INCLUDES_DSPLINK += [
-	 opj(cfg.env.TI_DSPLINK_DIR, 'dsplink', 'dsp', 'inc', dsp),
-	 d,
-	]
-
-	cfg.env.LINKFLAGS_DSPLINK += [
-	 opj(cfg.env.TI_DSPLINK_DIR, 'dsplink', 'dsp', 'export', 'BIN', 'DspBios', splat, board+'_0', 'RELEASE', 'dsplink%s.lib' % x)
-	 for x in ('', 'pool', 'mpcs', 'mplist', 'msg', 'data', 'notify', 'ringio')
-	]
-
-
-def options(opt):
-	opt.add_option('--with-ti-cgt', type='string', dest='ti-cgt-dir', help = 'Specify alternate cgt root folder', default="")
-	opt.add_option('--with-ti-biosutils', type='string', dest='ti-biosutils-dir', help = 'Specify alternate biosutils folder', default="")
-	opt.add_option('--with-ti-dspbios', type='string', dest='ti-dspbios-dir', help = 'Specify alternate dspbios folder', default="")
-	opt.add_option('--with-ti-dsplink', type='string', dest='ti-dsplink-dir', help = 'Specify alternate dsplink folder', default="")
-	opt.add_option('--with-ti-xdctools', type='string', dest='ti-xdctools-dir', help = 'Specify alternate xdctools folder', default="")
-
-class ti_cprogram(cprogram):
-	"""
-	Link object files into a c program
-	
-	Changes:
-
-	- the linked executable to have a relative path (because we can)
-	- put the LIBPATH first
-	"""
-	run_str = '${LINK_CC} ${LIBPATH_ST:LIBPATH} ${LIB_ST:LIB} ${LINKFLAGS} ${CCLNK_SRC_F}${SRC} ${CCLNK_TGT_F}${TGT[0].bldpath()} ${RPATH_ST:RPATH} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${FRAMEWORK_ST:FRAMEWORK} ${ARCH_ST:ARCH} ${STLIB_MARKER} ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} ${SHLIB_MARKER} '
-
-@feature("c")
-@before_method('apply_link')
-def use_ti_cprogram(self):
-	"""
-	Automatically uses ti_cprogram link process
-	"""
-	if 'cprogram' in self.features and self.env.CC_NAME == 'ticc':
-		self.features.insert(0, "ti_cprogram")
-
-class ti_c(Task.Task):
-	"""
-	Compile task for the TI codegen compiler
-
-	This compiler does not allow specifying the output file name, only the output path.
-
-	"""
-	"Compile C files into object files"
-	run_str = '${CC} ${ARCH_ST:ARCH} ${CFLAGS} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${CPPPATH_ST:INCPATHS} ${DEFINES_ST:DEFINES} ${SRC} -c ${OUT} ${CPPFLAGS}'
-	vars    = ['CCDEPS'] # unused variable to depend on, just in case
-	ext_in  = ['.h'] # set the build order easily by using ext_out=['.h']
-	scan    = c_preproc.scan
-
-def create_compiled_task(self, name, node):
-	"""
-	Overrides ccroot.create_compiled_task to support ti_c
-	"""
-	out = '%s' % (node.change_ext('.obj').name)
-	if self.env.CC_NAME == 'ticc':
-		name = 'ti_c'
-	task = self.create_task(name, node, node.parent.find_or_declare(out))
-	self.env.OUT = '-fr%s' % (node.parent.get_bld().abspath())
-	try:
-		self.compiled_tasks.append(task)
-	except AttributeError:
-		self.compiled_tasks = [task]
-	return task
-
-@TaskGen.extension('.c')
-def c_hook(self, node):
-	"Bind the c file extension to the creation of a :py:class:`waflib.Tools.c.c` instance"
-	if self.env.CC_NAME == 'ticc':
-		return create_compiled_task(self, 'ti_c', node)
-	else:
-		return self.create_compiled_task('c', node)
-
-
-@feature("ti-tconf")
-@before_method('process_source')
-def apply_tconf(self):
-	sources = [x.get_src() for x in self.to_nodes(self.source, path=self.path.get_src())]
-	node = sources[0]
-	assert(sources[0].name.endswith(".tcf"))
-	if len(sources) > 1:
-		assert(sources[1].name.endswith(".cmd"))
-
-	target = getattr(self, 'target', self.source)
-	target_node = node.get_bld().parent.find_or_declare(node.name)
-	
-	procid = "%d" % int(getattr(self, 'procid', 0))
-
-	importpaths = []
-	includes = Utils.to_list(getattr(self, 'includes', []))
-	for x in includes + self.env.TCONF_INCLUDES:
-		if x == os.path.abspath(x):
-			importpaths.append(x)
-		else:
-			relpath = self.path.find_node(x).path_from(target_node.parent)
-			importpaths.append(relpath)
-
-	task = self.create_task('ti_tconf', sources, target_node.change_ext('.cdb'))
-	task.path = self.path
-	task.includes = includes
-	task.cwd = target_node.parent.abspath()
-	task.env = self.env.derive()
-	task.env["TCONFSRC"] = node.path_from(target_node.parent)
-	task.env["TCONFINC"] = '-Dconfig.importPath=%s' % ";".join(importpaths)
-	task.env['TCONFPROGNAME'] = '-Dconfig.programName=%s' % target
-	task.env['PROCID'] = procid
-	task.outputs = [
-	 target_node.change_ext("cfg_c.c"),
-	 target_node.change_ext("cfg.s62"),
-	 target_node.change_ext("cfg.cmd"),
-	]
-
-	create_compiled_task(self, 'ti_c', task.outputs[1])
-	ctask = create_compiled_task(self, 'ti_c', task.outputs[0])
-	ctask.env = self.env.derive()
-
-	self.add_those_o_files(target_node.change_ext("cfg.cmd"))
-	if len(sources) > 1:
-		self.add_those_o_files(sources[1])
-	self.source = []
-
-re_tconf_include = re.compile(r'(?P<type>utils\.importFile)\("(?P<file>.*)"\)',re.M)
-class ti_tconf(Task.Task):
-	run_str = '${TCONF} ${TCONFINC} ${TCONFPROGNAME} ${TCONFSRC} ${PROCID}'
-	color   = 'PINK'
-
-	def scan(self):
-		includes = Utils.to_list(getattr(self, 'includes', []))
-
-		def deps(node):
-			nodes, names = [], []
-			if node:
-				code = Utils.readf(node.abspath())
-				for match in re_tconf_include.finditer(code):
-					path = match.group('file')
-					if path:
-						for x in includes:
-							filename = opj(x, path)
-							fi = self.path.find_resource(filename)
-							if fi:
-								subnodes, subnames = deps(fi)
-								nodes += subnodes
-								names += subnames
-								nodes.append(fi)
-								names.append(path)
-								break
-			return nodes, names
-		return deps(self.inputs[0])
-