xserver xkeyboard-config mesa git update 4 Marc 2011

2 files changed, 173 insertions, 169 deletions

diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py
index 457a02011..7c59fe985 100644
--- a/mesalib/scons/custom.py
+++ b/mesalib/scons/custom.py
@@ -1,169 +1,171 @@
-"""custom

-

-Custom builders and methods.

-

-"""

-

-#

-# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.

-# All Rights Reserved.

-#

-# Permission is hereby granted, free of charge, to any person obtaining a

-# copy of this software and associated documentation files (the

-# "Software"), to deal in the Software without restriction, including

-# without limitation the rights to use, copy, modify, merge, publish,

-# distribute, sub license, and/or sell copies of the Software, and to

-# permit persons to whom the Software is furnished to do so, subject to

-# the following conditions:

-#

-# The above copyright notice and this permission notice (including the

-# next paragraph) shall be included in all copies or substantial portions

-# of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

-# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

-# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-#

-

-

-import os

-import os.path

-import re

-

-import SCons.Action

-import SCons.Builder

-import SCons.Scanner

-

-import fixes

-

-

-def quietCommandLines(env):

-    # Quiet command lines

-    # See also http://www.scons.org/wiki/HidingCommandLinesInOutput

-    env['ASCOMSTR'] = "  Assembling $SOURCE ..."

-    env['ASPPCOMSTR'] = "  Assembling $SOURCE ..."

-    env['CCCOMSTR'] = "  Compiling $SOURCE ..."

-    env['SHCCCOMSTR'] = "  Compiling $SOURCE ..."

-    env['CXXCOMSTR'] = "  Compiling $SOURCE ..."

-    env['SHCXXCOMSTR'] = "  Compiling $SOURCE ..."

-    env['ARCOMSTR'] = "  Archiving $TARGET ..."

-    env['RANLIBCOMSTR'] = "  Indexing $TARGET ..."

-    env['LINKCOMSTR'] = "  Linking $TARGET ..."

-    env['SHLINKCOMSTR'] = "  Linking $TARGET ..."

-    env['LDMODULECOMSTR'] = "  Linking $TARGET ..."

-    env['SWIGCOMSTR'] = "  Generating $TARGET ..."

-    env['CODEGENCOMSTR'] = "  Generating $TARGET ..."

-

-

-def createConvenienceLibBuilder(env):

-    """This is a utility function that creates the ConvenienceLibrary

-    Builder in an Environment if it is not there already.

-

-    If it is already there, we return the existing one.

-

-    Based on the stock StaticLibrary and SharedLibrary builders.

-    """

-

-    try:

-        convenience_lib = env['BUILDERS']['ConvenienceLibrary']

-    except KeyError:

-        action_list = [ SCons.Action.Action("$ARCOM", "$ARCOMSTR") ]

-        if env.Detect('ranlib'):

-            ranlib_action = SCons.Action.Action("$RANLIBCOM", "$RANLIBCOMSTR")

-            action_list.append(ranlib_action)

-

-        convenience_lib = SCons.Builder.Builder(action = action_list,

-                                  emitter = '$LIBEMITTER',

-                                  prefix = '$LIBPREFIX',

-                                  suffix = '$LIBSUFFIX',

-                                  src_suffix = '$SHOBJSUFFIX',

-                                  src_builder = 'SharedObject')

-        env['BUILDERS']['ConvenienceLibrary'] = convenience_lib

-

-    return convenience_lib

-

-

-# TODO: handle import statements with multiple modules

-# TODO: handle from import statements

-import_re = re.compile(r'^import\s+(\S+)$', re.M)

-

-def python_scan(node, env, path):

-    # http://www.scons.org/doc/0.98.5/HTML/scons-user/c2781.html#AEN2789

-    contents = node.get_contents()

-    source_dir = node.get_dir()

-    imports = import_re.findall(contents)

-    results = []

-    for imp in imports:

-        for dir in path:

-            file = os.path.join(str(dir), imp.replace('.', os.sep) + '.py')

-            if os.path.exists(file):

-                results.append(env.File(file))

-                break

-            file = os.path.join(str(dir), imp.replace('.', os.sep), '__init__.py')

-            if os.path.exists(file):

-                results.append(env.File(file))

-                break

-    return results

-

-python_scanner = SCons.Scanner.Scanner(function = python_scan, skeys = ['.py'])

-

-

-def code_generate(env, script, target, source, command):

-    """Method to simplify code generation via python scripts.

-

-    http://www.scons.org/wiki/UsingCodeGenerators

-    http://www.scons.org/doc/0.98.5/HTML/scons-user/c2768.html

-    """

-

-    # We're generating code using Python scripts, so we have to be

-    # careful with our scons elements.  This entry represents

-    # the generator file *in the source directory*.

-    script_src = env.File(script).srcnode()

-

-    # This command creates generated code *in the build directory*.

-    command = command.replace('$SCRIPT', script_src.path)

-    action = SCons.Action.Action(command, "$CODEGENCOMSTR")

-    code = env.Command(target, source, action)

-

-    # Explicitly mark that the generated code depends on the generator,

-    # and on implicitly imported python modules

-    path = (script_src.get_dir(),)

-    deps = [script_src]

-    deps += script_src.get_implicit_deps(env, python_scanner, path)

-    env.Depends(code, deps)

-

-    # Running the Python script causes .pyc files to be generated in the

-    # source directory.  When we clean up, they should go too. So add side

-    # effects for .pyc files

-    for dep in deps:

-        pyc = env.File(str(dep) + 'c')

-        env.SideEffect(pyc, code)

-

-    return code

-

-

-def createCodeGenerateMethod(env):

-    env.Append(SCANNERS = python_scanner)

-    env.AddMethod(code_generate, 'CodeGenerate')

-

-

-def generate(env):

-    """Common environment generation code"""

-

-    if env.get('quiet', True):

-        quietCommandLines(env)

-

-    # Custom builders and methods

-    createConvenienceLibBuilder(env)

-    createCodeGenerateMethod(env)

-

-    # for debugging

-    #print env.Dump()

-

-

-def exists(env):

-    return 1

+"""custom
+
+Custom builders and methods.
+
+"""
+
+#
+# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+# All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+
+import os
+import os.path
+import re
+
+import SCons.Action
+import SCons.Builder
+import SCons.Scanner
+
+import fixes
+
+
+def quietCommandLines(env):
+    # Quiet command lines
+    # See also http://www.scons.org/wiki/HidingCommandLinesInOutput
+    env['ASCOMSTR'] = "  Assembling $SOURCE ..."
+    env['ASPPCOMSTR'] = "  Assembling $SOURCE ..."
+    env['CCCOMSTR'] = "  Compiling $SOURCE ..."
+    env['SHCCCOMSTR'] = "  Compiling $SOURCE ..."
+    env['CXXCOMSTR'] = "  Compiling $SOURCE ..."
+    env['SHCXXCOMSTR'] = "  Compiling $SOURCE ..."
+    env['ARCOMSTR'] = "  Archiving $TARGET ..."
+    env['RANLIBCOMSTR'] = "  Indexing $TARGET ..."
+    env['LINKCOMSTR'] = "  Linking $TARGET ..."
+    env['SHLINKCOMSTR'] = "  Linking $TARGET ..."
+    env['LDMODULECOMSTR'] = "  Linking $TARGET ..."
+    env['SWIGCOMSTR'] = "  Generating $TARGET ..."
+    env['LEXCOMSTR'] = "  Generating $TARGET ..."
+    env['YACCCOMSTR'] = "  Generating $TARGET ..."
+    env['CODEGENCOMSTR'] = "  Generating $TARGET ..."
+
+
+def createConvenienceLibBuilder(env):
+    """This is a utility function that creates the ConvenienceLibrary
+    Builder in an Environment if it is not there already.
+
+    If it is already there, we return the existing one.
+
+    Based on the stock StaticLibrary and SharedLibrary builders.
+    """
+
+    try:
+        convenience_lib = env['BUILDERS']['ConvenienceLibrary']
+    except KeyError:
+        action_list = [ SCons.Action.Action("$ARCOM", "$ARCOMSTR") ]
+        if env.Detect('ranlib'):
+            ranlib_action = SCons.Action.Action("$RANLIBCOM", "$RANLIBCOMSTR")
+            action_list.append(ranlib_action)
+
+        convenience_lib = SCons.Builder.Builder(action = action_list,
+                                  emitter = '$LIBEMITTER',
+                                  prefix = '$LIBPREFIX',
+                                  suffix = '$LIBSUFFIX',
+                                  src_suffix = '$SHOBJSUFFIX',
+                                  src_builder = 'SharedObject')
+        env['BUILDERS']['ConvenienceLibrary'] = convenience_lib
+
+    return convenience_lib
+
+
+# TODO: handle import statements with multiple modules
+# TODO: handle from import statements
+import_re = re.compile(r'^import\s+(\S+)$', re.M)
+
+def python_scan(node, env, path):
+    # http://www.scons.org/doc/0.98.5/HTML/scons-user/c2781.html#AEN2789
+    contents = node.get_contents()
+    source_dir = node.get_dir()
+    imports = import_re.findall(contents)
+    results = []
+    for imp in imports:
+        for dir in path:
+            file = os.path.join(str(dir), imp.replace('.', os.sep) + '.py')
+            if os.path.exists(file):
+                results.append(env.File(file))
+                break
+            file = os.path.join(str(dir), imp.replace('.', os.sep), '__init__.py')
+            if os.path.exists(file):
+                results.append(env.File(file))
+                break
+    return results
+
+python_scanner = SCons.Scanner.Scanner(function = python_scan, skeys = ['.py'])
+
+
+def code_generate(env, script, target, source, command):
+    """Method to simplify code generation via python scripts.
+
+    http://www.scons.org/wiki/UsingCodeGenerators
+    http://www.scons.org/doc/0.98.5/HTML/scons-user/c2768.html
+    """
+
+    # We're generating code using Python scripts, so we have to be
+    # careful with our scons elements.  This entry represents
+    # the generator file *in the source directory*.
+    script_src = env.File(script).srcnode()
+
+    # This command creates generated code *in the build directory*.
+    command = command.replace('$SCRIPT', script_src.path)
+    action = SCons.Action.Action(command, "$CODEGENCOMSTR")
+    code = env.Command(target, source, action)
+
+    # Explicitly mark that the generated code depends on the generator,
+    # and on implicitly imported python modules
+    path = (script_src.get_dir(),)
+    deps = [script_src]
+    deps += script_src.get_implicit_deps(env, python_scanner, path)
+    env.Depends(code, deps)
+
+    # Running the Python script causes .pyc files to be generated in the
+    # source directory.  When we clean up, they should go too. So add side
+    # effects for .pyc files
+    for dep in deps:
+        pyc = env.File(str(dep) + 'c')
+        env.SideEffect(pyc, code)
+
+    return code
+
+
+def createCodeGenerateMethod(env):
+    env.Append(SCANNERS = python_scanner)
+    env.AddMethod(code_generate, 'CodeGenerate')
+
+
+def generate(env):
+    """Common environment generation code"""
+
+    if env.get('quiet', True):
+        quietCommandLines(env)
+
+    # Custom builders and methods
+    createConvenienceLibBuilder(env)
+    createCodeGenerateMethod(env)
+
+    # for debugging
+    #print env.Dump()
+
+
+def exists(env):
+    return 1
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index 112f6c89d..34523d589 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -598,6 +598,8 @@ def generate(env):
     env.Append(LIBS = [])
 
     # Load tools
+    env.Tool('lex')
+    env.Tool('yacc')
     if env['llvm']:
         env.Tool('llvm')
         env.Tool('udis86')