scons: Expose convienience libraries to the host environment.
This fixes MinGW cross compilation build, recently broken due to the use of convenience libraries in the GLSL preprocessor.
This commit is contained in:
José Fonseca
@@ -166,11 +166,14 @@ if env['platform'] != common.default_platform:
|
||||
host_env = Environment(
|
||||
# options are ignored
|
||||
# default tool is used
|
||||
tools = ['default', 'custom'],
|
||||
toolpath = ['#scons'],
|
||||
ENV = os.environ,
|
||||
)
|
||||
|
||||
host_env['platform'] = common.default_platform
|
||||
host_env['machine'] = common.default_machine
|
||||
host_env['debug'] = env['debug']
|
||||
|
||||
SConscript(
|
||||
'src/glsl/SConscript',
|
||||
|
||||
198
scons/custom.py
Normal file
198
scons/custom.py
Normal file
@@ -0,0 +1,198 @@
|
||||
"""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 ..."
|
||||
|
||||
|
||||
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)
|
||||
code = env.Command(target, source, command)
|
||||
|
||||
# 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 symlink(target, source, env):
|
||||
target = str(target[0])
|
||||
source = str(source[0])
|
||||
if os.path.islink(target) or os.path.exists(target):
|
||||
os.remove(target)
|
||||
os.symlink(os.path.basename(source), target)
|
||||
|
||||
def install_program(env, source):
|
||||
source = str(source[0])
|
||||
target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build'], 'bin')
|
||||
target_name = str(source)
|
||||
env.InstallAs(os.path.join(target_dir, target_name), source)
|
||||
|
||||
def install_shared_library(env, source, version = ()):
|
||||
source = str(source[0])
|
||||
version = tuple(map(str, version))
|
||||
target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build'], 'lib')
|
||||
target_name = '.'.join((str(source),) + version)
|
||||
last = env.InstallAs(os.path.join(target_dir, target_name), source)
|
||||
while len(version):
|
||||
version = version[:-1]
|
||||
target_name = '.'.join((str(source),) + version)
|
||||
action = SCons.Action.Action(symlink, "$TARGET -> $SOURCE")
|
||||
last = env.Command(os.path.join(target_dir, target_name), last, action)
|
||||
|
||||
def createInstallMethods(env):
|
||||
env.AddMethod(install_program, 'InstallProgram')
|
||||
env.AddMethod(install_shared_library, 'InstallSharedLibrary')
|
||||
|
||||
|
||||
def generate(env):
|
||||
"""Common environment generation code"""
|
||||
|
||||
if env.get('quiet', True):
|
||||
quietCommandLines(env)
|
||||
|
||||
# Custom builders and methods
|
||||
createConvenienceLibBuilder(env)
|
||||
createCodeGenerateMethod(env)
|
||||
createInstallMethods(env)
|
||||
|
||||
# for debugging
|
||||
#print env.Dump()
|
||||
|
||||
|
||||
def exists(env):
|
||||
return 1
|
||||
116
scons/gallium.py
116
scons/gallium.py
@@ -38,116 +38,6 @@ 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 ..."
|
||||
|
||||
|
||||
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)
|
||||
code = env.Command(target, source, command)
|
||||
|
||||
# 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 symlink(target, source, env):
|
||||
target = str(target[0])
|
||||
@@ -201,9 +91,6 @@ def num_jobs():
|
||||
def generate(env):
|
||||
"""Common environment generation code"""
|
||||
|
||||
if env.get('quiet', True):
|
||||
quietCommandLines(env)
|
||||
|
||||
# Toolchain
|
||||
platform = env['platform']
|
||||
if env['toolchain'] == 'default':
|
||||
@@ -543,8 +430,7 @@ def generate(env):
|
||||
env.Append(LIBS = [])
|
||||
|
||||
# Custom builders and methods
|
||||
createConvenienceLibBuilder(env)
|
||||
createCodeGenerateMethod(env)
|
||||
env.Tool('custom')
|
||||
createInstallMethods(env)
|
||||
|
||||
# for debugging
|
||||
|
||||
104
scons/generic.py
104
scons/generic.py
@@ -41,107 +41,6 @@ import SCons.Builder
|
||||
import SCons.Scanner
|
||||
|
||||
|
||||
def quietCommandLines(env):
|
||||
# Quiet command lines
|
||||
# See also http://www.scons.org/wiki/HidingCommandLinesInOutput
|
||||
env['CCCOMSTR'] = "Compiling $SOURCE ..."
|
||||
env['CXXCOMSTR'] = "Compiling $SOURCE ..."
|
||||
env['ARCOMSTR'] = "Archiving $TARGET ..."
|
||||
env['RANLIBCOMSTR'] = ""
|
||||
env['LINKCOMSTR'] = "Linking $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)
|
||||
code = env.Command(target, source, command)
|
||||
|
||||
# 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 symlink(target, source, env):
|
||||
target = str(target[0])
|
||||
source = str(source[0])
|
||||
@@ -578,8 +477,7 @@ def generate(env):
|
||||
env.Append(LIBS = [])
|
||||
|
||||
# Custom builders and methods
|
||||
createConvenienceLibBuilder(env)
|
||||
createCodeGenerateMethod(env)
|
||||
env.Tool('custom')
|
||||
createInstallMethods(env)
|
||||
|
||||
# for debugging
|
||||
|
||||
Reference in New Issue
Block a user