Merge branch 'master' of git://github.com/tuttleofx/sconsProject into precompiled_header_proposal

Author: edubois

__init__.py

@@ -92,6 +92,7 @@ def createCustomPlugins( self, sources=[], libs=[] ):
 	dir_output        = 'undefined'               #
 	dir_output_bin    = 'undefined'               # name generated depending on compilation type,
 	dir_output_lib    = 'undefined'               # we need to know if we are in debug mode, etc.
+	dir_output_plugin = 'undefined'
 	dir_output_header = 'undefined'               # (options needs to be initilized)
 	dir_output_test   = 'undefined'               #
 	dir_sconsProject  = os.path.abspath(os.path.dirname(__file__)) # directory containing this file
@@ -106,6 +107,7 @@ def createCustomPlugins( self, sources=[], libs=[] ):
                                             'packaging',
                                             'doxygen',
                                             'unittest',
+                                            'scripttest',
                                             ] + (['msvs'] if windows else []),
                                          toolpath=[os.path.join(dir_sconsProject,'tools')] )
 
@@ -199,6 +201,7 @@ def printInfos(self):
 		print ':: dir                = ' + self.dir
 		print ':: dir_output_build   = ' + self.dir_output_build
 		print ':: dir_output_bin     = ' + self.dir_output_bin
+		print ':: dir_output_plugin  = ' + self.dir_output_plugin
 		print ':: dir_output_lib     = ' + self.dir_output_lib
 		print ':: dir_output_test    = ' + self.dir_output_test
 		print ':: dir_sconsProject   = ' + self.dir_sconsProject
@@ -396,6 +399,15 @@ def inOutputBin(self, *dirs):
 		l_dirs = SCons.Util.flatten(dirs)
 		return [ self.inOutputBin(d) for d in l_dirs ]
 
+	def inOutputPlugin(self, *dirs):
+		'''Returns "dirs" as subdirectories of "outputPlugin".'''
+		if not dirs:
+			return self.dir_output_plugin
+		if len(dirs) == 1 and isinstance(dirs[0], str):
+			return os.path.join( self.inOutputPlugin(), dirs[0] )
+		l_dirs = SCons.Util.flatten(dirs)
+		return [ self.inOutputPlugin(d) for d in l_dirs ]
+
 	def inOutputTest(self, *dirs):
 		'''Returns "dirs" as subdirectories of "outputTest".'''
 		if not dirs:
@@ -444,6 +456,8 @@ def initOptions(self):
 		Read options from configuration files and at last from the command line
 		(which has the last word)
 		'''
+
+		self.env.Tool('default')
 		# default values
 		if self.windows:
 			self.compiler    = compiler.visual
@@ -468,11 +482,12 @@ def initOptions(self):
 		else:
 			self.env['CCVERSION'] = self.compiler.version(self.env['CC'])
 			self.env['CXXVERSION'] = self.compiler.version(self.env['CXX'])
-		
+
 		# select the environment from user options
 		compilerName = self.env['compiler']
 		self.compiler   = eval( 'compiler.' + compilerName )
 		self.CC         = self.compiler.CC
+
 		if self.windows:
 			if compilerName == 'visual':
 				self.env.Tool('default')
@@ -482,8 +497,6 @@ def initOptions(self):
 			else:
 				self.env.Tool('default')
 				print 'Error: Unrecognized compiler value on this platform. ('+str(compilerName)+')'
-		else:
-			self.env.Tool('default')
 
 	def createOptions(self, filename, args):
 		'''
@@ -514,6 +527,9 @@ def help_format(env, opt, help, default, actual, aliases):
 		opts.Add('CC', 'Specify the C Compiler', self.compiler.ccBin)
 		opts.Add('CXX', 'Specify the C++ Compiler', self.compiler.cxxBin)
 
+		opts.Add('SCRIPTTESTXX', 'Specify the script test binary', "nosetests")
+		opts.Add('SCRIPTTESTFLAGS', 'Specify the script test flags', "")
+
 		opts.Add('ENVINC', 'Additional include path (at compilation)', [] if not self.windows else os.environ.get('INCLUDE', '').split(':'))
 		opts.Add('ENVPATH', 'Additional bin path (at compilation)', [])
 		opts.Add('ENVLIBPATH', 'Additional librairie path (at compilation)', [] if not self.windows else os.environ.get('LIB', '').split(':'))
@@ -615,6 +631,7 @@ def applyOptionsOnProject(self):
 		self.dir_output        = install_dir
 		self.dir_output_bin    = os.path.join(install_dir, 'bin')
 		self.dir_output_lib    = os.path.join(install_dir, 'lib')
+		self.dir_output_plugin = os.path.join(install_dir, 'plugin')
 		self.dir_output_header = os.path.join(install_dir, 'include')
 		self.dir_output_test   = os.path.join(install_dir, 'test')
 
@@ -1388,7 +1405,7 @@ def UnitTest( self, target=None, sources=[], dirs=[], env=None, libraries=[], in
 			l_sources += self.scanFiles( l_dirs, accept, reject, inBuildDir=True )
 
 		if not l_sources:
-			raise RuntimeError( 'No source files for the target: ' + l_target )
+			raise RuntimeError( 'No source files for the target: ' + str(l_target) )
 
 		localEnv = None
 		localLibraries = l_libraries
@@ -1415,6 +1432,51 @@ def UnitTest( self, target=None, sources=[], dirs=[], env=None, libraries=[], in
 
 		return dst
 
+	def ScriptTests( self, target=None, sources=[], dirs=[], env=None, libraries=[], dependencies=[], envFlags={}, procEnvFlags={},
+	                         accept=['test*.py'], reject=['@'] ):
+		'''
+		This target is a list of python script files to execute.
+		'''
+		l_target = target
+		if target is None:
+			l_target = self.getDirs(0)
+		
+		l_sources = self.asList(sources)
+		l_dirs = self.asList(dirs)
+		l_libraries = self.asList(libraries)
+		l_dependencies = self.asList(dependencies)
+		
+		if l_dirs:
+			l_sources += self.scanFiles( l_dirs, accept, reject, inBuildDir=True )
+
+		if not l_sources:
+			raise RuntimeError( 'No source files for the target: ' + str(l_target) )
+		
+		localEnv = None
+		localLibraries = l_libraries
+		if env:
+			localEnv = env.Clone()
+			if 'SconsProjectLibraries' in localEnv:
+				localLibraries += localEnv['SconsProjectLibraries']
+			self.appendLibsToEnv(localEnv, localLibraries)
+		else:
+			# if no environment we create a new one
+			localEnv = self.createEnv( localLibraries, name='-'.join(l_target) )
+
+		if envFlags:
+			localEnv.AppendUnique( **envFlags )
+		if procEnvFlags:
+			for k, v in procEnvFlags.iteritems():
+				localEnv.PrependENVPath( k, v )
+
+		# create the target
+		allDst = []
+		for s in l_sources:
+			dst = localEnv.ScriptTest( source=s, target=l_target )
+			allDst.append(dst)
+
+		return dst
+
 #-------------------- Automatic file/directory search -------------------------#
 	def asList(self, v):
 		'''Return v inside a list if not a list.'''

autoconf/boost_atomic.py

@@ -0,0 +1,9 @@
+from _external import *
+from boost import *
+
+boost_atomic = HeaderChecker(
+	'boost_atomic',
+	['boost/atomic.hpp'],
+	'c++',
+	dependencies=[boost] )
+

autoconf/boost_thread.py

@@ -1,6 +1,12 @@
 from _external import *
 from boost import *
+from boost_system import *
 
-boost_thread = LibWithHeaderChecker( 'boost_thread', 'boost/thread.hpp', 'c++',
-                                     name='boost_thread', dependencies=[boost] )
+boost_thread = LibWithHeaderChecker(
+	'boost_thread',
+	'boost/thread.hpp',
+	'c++',
+	name='boost_thread',
+	dependencies=[boost, boost_system]
+	)
 

autoconf/corefoundation.py

@@ -0,0 +1,6 @@
+from _external import *
+
+corefoundation = LibWithHeaderChecker('CoreFoundation',
+                                      'CoreFoundation.h',
+                                      'c++',
+                                      name='corefoundation')

autoconf/freeglut.py

@@ -3,7 +3,7 @@
 from glu import *
 
 freeglut = LibWithHeaderChecker(
-		'freeglut',
+		'glut',
 		['GL/freeglut.h'],
 		'c',
 		dependencies=[gl,glu]

autoconf/numpy.py

@@ -0,0 +1,6 @@
+from _external import *
+
+numpy = LibWithHeaderChecker( name='numpy',
+                              libs='npymath',
+                              header='numpy/numpyconfig.h',
+                              language='c')

autoconf/openimageio.py

@@ -1,10 +1,21 @@
 from _external import *
+from boost_filesystem import *
+from boost_regex import *
+from boost_system import *
+from boost_thread import *
+from half import *
 from dl import *
 
 openimageio = LibWithHeaderChecker(
             ['OpenImageIO'], 'imageio.h', 'c++',
             name='openimageio',
             call='',
-            dependencies =[dl] )
+            dependencies = [
+                boost_filesystem,
+                boost_regex,
+                boost_system,
+                boost_thread,
+                half,
+                dl] )
 
 

autoconf/raw.py

@@ -1,4 +1,5 @@
 from _external import *
+from m import *
 from gomp import *
 from littlecms import *
 
@@ -7,6 +8,7 @@
 		'libraw/libraw.h',
 		'c',
 		dependencies = [
+			m,
 			gomp,
 			littlecms,
 		]

autoconf/turbojpeg.py

@@ -0,0 +1,3 @@
+from _external import *
+
+turbojpeg = LibWithHeaderChecker('turbojpeg', ['turbojpeg.h'], 'c')

compiler/gcc.py

@@ -12,7 +12,7 @@
 linkBin = ccBin
 linkxxBin = cxxBin
 
-def version( bin = 'gcc' ):
+def version( bin = ccBin ):
 	import subprocess
 	try:
 		return subprocess.Popen( [bin, CC['version']], stdout=subprocess.PIPE, stderr=subprocess.PIPE ).communicate()[0].strip()