projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: do not allow implicit casts of unsized array initializers
[mesa.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index ef71ab69c3844cd0a3837f76f34d639ea460cd79..51dc301a9a86dc474854510990c3389cd9f249d9 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-1,7
+1,7
@@
#######################################################################
# Top-level SConstruct
#
#######################################################################
# Top-level SConstruct
#
-# For example, invoke scons as
+# For example, invoke scons as
#
# scons build=debug llvm=yes machine=x86
#
#
# scons build=debug llvm=yes machine=x86
#
@@
-12,13
+12,13
@@
# build='debug'
# llvm=True
# machine='x86'
# build='debug'
# llvm=True
# machine='x86'
-#
+#
# Invoke
#
# scons -h
#
# to get the full list of options. See scons manpage for more info.
# Invoke
#
# scons -h
#
# to get the full list of options. See scons manpage for more info.
-#
+#
import os
import os.path
import os
import os.path
@@
-27,6
+27,13
@@
import SCons.Util
import common
import common
+#######################################################################
+# Minimal scons version
+
+EnsureSConsVersion(2, 4)
+EnsurePythonVersion(2, 7)
+
+
#######################################################################
# Configuration options
#######################################################################
# Configuration options
@@
-36,7
+43,7
@@
common.AddOptions(opts)
env = Environment(
options = opts,
tools = ['gallium'],
env = Environment(
options = opts,
tools = ['gallium'],
- toolpath = ['#scons'],
+ toolpath = ['#scons'],
ENV = os.environ,
)
ENV = os.environ,
)
@@
-50,10
+57,10
@@
except KeyError:
pass
else:
targets = targets.split(',')
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)
COMMAND_LINE_TARGETS.append(targets)
@@
-84,9
+91,14
@@
env.Append(CPPPATH = [
#print env.Dump()
#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.
#
# For things that are meant to be run on the native host build machine, instead
# of the target machine.
#
@@
-147,8
+159,7
@@
try:
except ImportError:
pass
else:
except ImportError:
pass
else:
- aliases = default_ans.keys()
- aliases.sort()
+ aliases = sorted(default_ans.keys())
env.Help('\n')
env.Help('Recognized targets:\n')
for alias in aliases:
env.Help('\n')
env.Help('Recognized targets:\n')
for alias in aliases: