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

edubois · edubois · commit be912ecf7f38 · 2013-04-29T08:35:39.000+02:00
Conflicts:
	__init__.py
diff --git a/__init__.py b/__init__.py
diff --git a/autoconf/_base.py b/autoconf/_base.py
@@ -153,8 +153,7 @@ def privateCheckFrameworkWithHeader( self, conf, framework, header, language, ca
 		#conf.env.Append( LINKFLAGS = fwk )
 		#conf.env.Append( CCFLAGS = fwk ) # ?
 		conf.env.Append( FRAMEWORKS = p_framework )
-		self.privateCheckLibWithHeader( conf, libs=[], header=header, language=language )
-		return True
+		return self.privateCheckLibWithHeader( conf, libs=[], header=header, language=language )
 
 	def privateCheckLib( self, conf, libs ):
 		if conf.env['check_libs'] and not self.checkDone:
@@ -171,8 +170,7 @@ def privateCheckFramework( self, conf, framework, language, call=False ):
 		p_framework = asList(framework)
 		#conf.env.Append( LINKFLAGS = reduce(add, [ ['-framework',f] for f in framework], []) )
 		conf.env.Append( FRAMEWORKS = p_framework )
-		self.privateCheckLib( conf, libs=[] )
-		return True
+		return self.privateCheckLib( conf, libs=[] )
 
 	def CheckLibWithHeader( self, conf, libs, header, language, call=False ):
 		if self.useFramework(conf.env):
diff --git a/autoconf/avcodec.py b/autoconf/avcodec.py
@@ -0,0 +1,7 @@
+from _external import *
+
+avcodec = LibWithHeaderChecker(
+				'avcodec',
+				'libavcodec/avcodec.h',
+				'c',
+			)
diff --git a/autoconf/avfilter.py b/autoconf/avfilter.py
@@ -0,0 +1,7 @@
+from _external import *
+
+avfilter = LibWithHeaderChecker(
+				'avfilter',
+				'libavfilter/avfilter.h',
+				'c',
+			)
diff --git a/autoconf/avformat.py b/autoconf/avformat.py
@@ -0,0 +1,7 @@
+from _external import *
+
+avformat = LibWithHeaderChecker(
+				'avformat',
+				'libavformat/avformat.h',
+				'c',
+			)
diff --git a/autoconf/avresample.py b/autoconf/avresample.py
@@ -0,0 +1,7 @@
+from _external import *
+
+avresample = LibWithHeaderChecker(
+				'avresample',
+				'libavresample/avresample.h',
+				'c',
+			)
diff --git a/autoconf/avutil.py b/autoconf/avutil.py
@@ -0,0 +1,7 @@
+from _external import *
+
+avutil = LibWithHeaderChecker(
+				'avutil',
+				'libavutil/avutil.h',
+				'c',
+			)
diff --git a/autoconf/boost_thread.py b/autoconf/boost_thread.py
@@ -6,7 +6,6 @@
 	'boost_thread',
 	'boost/thread.hpp',
 	'c++',
-	name='boost_thread',
 	dependencies=[boost, boost_system]
 	)
 
diff --git a/autoconf/boost_timer.py b/autoconf/boost_timer.py
@@ -0,0 +1,10 @@
+from _external import *
+from boost import *
+
+boost_timer = LibWithHeaderChecker(
+	'boost_timer',
+	'boost/timer/timer.hpp',
+	'c++',
+	dependencies=[boost],
+	)
+
diff --git a/autoconf/cairo.py b/autoconf/cairo.py
@@ -0,0 +1,4 @@
+from _external import *
+
+cairo = LibWithHeaderChecker('cairo','cairo.h','c' )
+
diff --git a/autoconf/fontconfig.py b/autoconf/fontconfig.py
@@ -0,0 +1,3 @@
+from _external import *
+
+fontconfig = LibWithHeaderChecker('fontconfig', 'fontconfig/fontconfig.h', 'c')
diff --git a/autoconf/freetype.py b/autoconf/freetype.py
@@ -1,4 +1,8 @@
 from _external import *
 
-freetype = LibWithHeaderChecker('freetype', 'ft2build.h', 'c')
+if windows:
+    freetype = LibWithHeaderChecker('freetype', ['ft2build.h'], 'c')
+else:
+    from fontconfig import *
+    freetype = LibWithHeaderChecker('freetype', 'ft2build.h', 'c', dependencies=[fontconfig] )
 
diff --git a/autoconf/glib.py b/autoconf/glib.py
@@ -0,0 +1,4 @@
+from _external import *
+
+glib = HeaderChecker('glib','glib.h','c' )
+
diff --git a/autoconf/glibmm.py b/autoconf/glibmm.py
@@ -0,0 +1,5 @@
+from _external import *
+from glib import *
+
+glibmm = HeaderChecker('glibmm','glibmm.h','c++', dependencies=[ glib ] )
+
diff --git a/autoconf/glu.py b/autoconf/glu.py
@@ -1,10 +1,7 @@
 from _external import *
 from gl import *
 
-glu = LibWithHeaderChecker(
-		'GLU' if not windows else 'GLU32',
-		['GL/glu.h'],
-		'c',
-		dependencies=[gl]
-	)
-
+if windows:
+    glu = LibWithHeaderChecker('GLU32', ['windows.h','GL/glu.h'], 'c', dependencies=[gl])   
+else : 
+    glu = LibWithHeaderChecker('GLU', ['GL/glu.h'], 'c', dependencies=[gl])
diff --git a/autoconf/gobject.py b/autoconf/gobject.py
@@ -0,0 +1,5 @@
+from _external import *
+from glib import *
+
+gobject = LibWithHeaderChecker('gobject','glib-object.h','c', dependencies=[ glib ] )
+
diff --git a/autoconf/lcms.py b/autoconf/lcms.py
@@ -1,3 +1,3 @@
 from _external import *
 
-lcms = LibWithHeaderChecker('lcms', ['lcms.h'], 'c')
+lcms = LibWithHeaderChecker('lcms2', ['lcms2.h'], 'c')
diff --git a/autoconf/littlecms.py b/autoconf/littlecms.py
diff --git a/autoconf/numpy.py b/autoconf/numpy.py
diff --git a/autoconf/poppler_glib.py b/autoconf/poppler_glib.py
@@ -0,0 +1,25 @@
+from _external import *
+from glib import *
+from gobject import *
+from cairo import *
+from freetype import *
+from lcms import *
+from tiff import *
+from jpeg import *
+from png import *
+from fontconfig import *
+
+poppler_glib = LibWithHeaderChecker('poppler_glib','poppler/glib/poppler.h','c',
+	dependencies=[
+		glib,
+		gobject,
+		cairo,
+		freetype,
+		lcms,
+		tiff,
+		jpeg,
+		png,
+		fontconfig,
+		] )
+
+
diff --git a/autoconf/python_numpy.py b/autoconf/python_numpy.py
@@ -0,0 +1,10 @@
+from _external import *
+from python import *
+
+python_numpy = HeaderChecker(
+                   name='numpy',
+                   # libs='npymath',
+                   header='numpy/numpyconfig.h',
+                   language='c',
+                   dependencies=[python])
+
diff --git a/autoconf/qt4.py b/autoconf/qt4.py
@@ -122,7 +122,12 @@ def configure(self, project, env):
 		
 		# don't need emitter with qt4
 		env['BUILDERS']['Uic'].emitter = None
-		
+
+		if env['mode'] != 'debug' :
+			env.AppendUnique( CPPDEFINES = 'QMLJSDEBUGGER' )
+			env.AppendUnique( CPPDEFINES = 'QT_DECLARATIVE_DEBUG' )  # QtQuick 1
+			#env.AppendUnique( CPPDEFINES = 'QT_QML_DEBUG' )  # QtQuick 2
+
 		return BaseLibChecker.configure(self, project, env)
 	
 	def check(self, project, conf):
diff --git a/autoconf/raw.py b/autoconf/raw.py
@@ -1,7 +1,7 @@
 from _external import *
 from m import *
 from gomp import *
-from littlecms import *
+from lcms import *
 
 raw = LibWithHeaderChecker(
 		'raw',
@@ -10,7 +10,7 @@
 		dependencies = [
 			m,
 			gomp,
-			littlecms,
+			lcms,
 		]
 	)
 
diff --git a/autoconf/sconsProject.py b/autoconf/sconsProject.py
@@ -17,14 +17,14 @@ def configure(self, project, env):
         if not self.enabled(env):
             return True
         env.AppendUnique( LIBPATH = [ project.inOutputLib() ] )
-        
+
         env.AppendUnique( CPPSUFFIXES = [ '.tcc' ] )
         # CPPSUFFIXES: The list of suffixes of files that will be scanned for C preprocessor implicit dependencies (#include lines).
         # The default list is [".c", ".C", ".cxx", ".cpp", ".c++", ".cc", ".h", ".H", ".hxx", ".hpp", ".hh", ".F", ".fpp", ".FPP", ".m", ".mm", ".S", ".spp", ".SPP"]
 
         env.AppendUnique( CCFLAGS = project.CC['base'] )
         env.AppendUnique( LINKFLAGS = project.CC['linkbase'] )
-        
+
         if windows:
             env.AppendUnique( CPPDEFINES = 'WIN' )
             env.AppendUnique( CPPDEFINES = 'WINDOWS' )
@@ -37,25 +37,22 @@ def configure(self, project, env):
             if macos: # for disabling macros such as check, verify, require ... (AssertMacros.h)
                 env.AppendUnique( CPPDEFINES = '__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0')
 
-        if env['mode'] == 'debug' :
-            env.AppendUnique( CCFLAGS = project.CC['debug'] )
-            env.AppendUnique( CPPDEFINES = 'DEBUG' )
-        else :
-            env.AppendUnique( CCFLAGS = project.CC['release'] )
+        if env['mode'] != 'debug' :
             env.AppendUnique( CPPDEFINES = 'NDEBUG' )
-            env.AppendUnique( CPPDEFINES = 'RELEASE' )
 
-        if env['mode'] == 'production' :
-            env.AppendUnique( CPPDEFINES = 'PRODUCTION' )
+        env.AppendUnique( CPPDEFINES = env['mode'].upper() )
+
+        env.AppendUnique( CCFLAGS = project.CC[env['mode']] )
+        env.AppendUnique( LINKFLAGS = project.CC['link'+env['mode']] )
 
         if env['profile'] :
             env.AppendUnique( CCFLAGS = project.CC['profile'] )
             env.AppendUnique( LINKFLAGS = project.CC['linkprofile'] )
-            
+
         if env['cover'] :
             env.AppendUnique( CCFLAGS = project.CC['cover'] )
             env.AppendUnique( LINKFLAGS = project.CC['linkcover'] )
-        
+
         return True
 
 
diff --git a/autoconf/swscale.py b/autoconf/swscale.py
@@ -0,0 +1,7 @@
+from _external import *
+
+swscale = LibWithHeaderChecker(
+				'swscale',
+				'libswscale/swscale.h',
+				'c',
+			)
diff --git a/autoconf/tidy.py b/autoconf/tidy.py
@@ -0,0 +1,3 @@
+from _external import *
+
+tidy = LibWithHeaderChecker('tidy', 'tidy/tidy.h', 'c', name='tidy' )
diff --git a/autoconf/xmlpp.py b/autoconf/xmlpp.py
@@ -0,0 +1,5 @@
+from _external import *
+from glibmm import *
+
+xmlpp = HeaderChecker('xmlpp','libxml++/libxml++.h','c++', dependencies=[ glibmm ] )
+
diff --git a/compiler/gcc.py b/compiler/gcc.py
diff --git a/compiler/visual.py b/compiler/visual.py
diff --git a/tools/scripttest.py b/tools/scripttest.py
diff --git a/utils/utils.py b/utils/utils.py

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`'boost_thread',`
`7`	`7`	`'boost/thread.hpp',`
`8`	`8`	`'c++',`
`9`		`- name='boost_thread',`
`10`	`9`	`dependencies=[boost, boost_system]`
`11`	`10`	`)`
`12`	`11`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +from _external import *
++
 +cairo = LibWithHeaderChecker('cairo','cairo.h','c' )
++