X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=SConstruct;h=a59a8ea210e956bb67deb93272534804d88754e3;hp=6b725c4b6959a7f994ff1a5327cd2bfbb304195a;hb=109de3049dda6be2a5a3910f777feea0bbf9ce92;hpb=ef4bf40db03ff1df2bae2db8f4a65421bf4a7c06

diff --git a/SConstruct b/SConstruct
index 6b725c4b695..a59a8ea210e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,7 +1,7 @@
 #######################################################################
 # Top-level SConstruct
 #
-# For example, invoke scons as 
+# For example, invoke scons as
 #
 #   scons build=debug llvm=yes machine=x86
 #
@@ -12,13 +12,13 @@
 #   build='debug'
 #   llvm=True
 #   machine='x86'
-# 
+#
 # Invoke
 #
 #   scons -h
 #
 # to get the full list of options. See scons manpage for more info.
-#  
+#
 
 import os
 import os.path
@@ -36,11 +36,12 @@ common.AddOptions(opts)
 env = Environment(
 	options = opts,
 	tools = ['gallium'],
-	toolpath = ['#scons'],	
+	toolpath = ['#scons'],
 	ENV = os.environ,
 )
 
-opts.Save('config.py', env)
+# XXX: This creates a many problems as it saves...
+#opts.Save('config.py', env)
 
 # Backwards compatability with old target configuration variable
 try:
@@ -49,25 +50,25 @@ except KeyError:
     pass
 else:
     targets = targets.split(',')
-    print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
-    print
-    print '  scons %s' % ' '.join(targets)
-    print 
+    print('scons: warning: targets option is deprecated; pass the targets on their own such as')
+    print()
+    print('  scons %s' % ' '.join(targets))
+    print()
     COMMAND_LINE_TARGETS.append(targets)
 
 
 Help(opts.GenerateHelpText(env))
 
-# fail early for a common error on windows
-if env['gles']:
-    try:
-        import libxml2
-    except ImportError:
-        raise SCons.Errors.UserError, "GLES requires libxml2-python to build"
-
 #######################################################################
 # Environment setup
 
+with open("VERSION") as f:
+  mesa_version = f.read().strip()
+env.Append(CPPDEFINES = [
+    ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
+    ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
+])
+
 # Includes
 env.Prepend(CPPPATH = [
 	'#/include',
@@ -79,16 +80,18 @@ env.Append(CPPPATH = [
 	'#/src/gallium/winsys',
 ])
 
-if env['msvc']:
-    env.Append(CPPPATH = ['#include/c99'])
-
 # for debugging
 #print env.Dump()
 
 
+# Add a check target for running tests
+check = env.Alias('check')
+env.AlwaysBuild(check)
+
+
 #######################################################################
-# Invoke host SConscripts 
-# 
+# Invoke host SConscripts
+#
 # For things that are meant to be run on the native host build machine, instead
 # of the target machine.
 #
@@ -114,9 +117,6 @@ if env['crosscompile'] and not env['embedded']:
     host_env['hostonly'] = True
     assert host_env['crosscompile'] == False
 
-    if host_env['msvc']:
-        host_env.Append(CPPPATH = ['#include/c99'])
-
     target_env = env
     env = host_env
     Export('env')
@@ -143,3 +143,17 @@ SConscript(
 	duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )
 
+
+########################################################################
+# List all aliases
+
+try:
+    from SCons.Node.Alias import default_ans
+except ImportError:
+    pass
+else:
+    aliases = sorted(default_ans.keys())
+    env.Help('\n')
+    env.Help('Recognized targets:\n')
+    for alias in aliases:
+        env.Help('    %s\n' % alias)