Revamp scons usage.
This commit is contained in:
José Fonseca
46
SConstruct
46
SConstruct
@@ -34,11 +34,18 @@ platform_map = {
|
||||
}
|
||||
|
||||
default_platform = platform_map.get(sys.platform, sys.platform)
|
||||
default_drivers = 'all'
|
||||
|
||||
if default_platform in ('linux', 'freebsd', 'darwin'):
|
||||
default_x11 = 'yes'
|
||||
default_statetrackers = 'mesa'
|
||||
default_drivers = 'softpipe,failover,i915simple,i965simple'
|
||||
default_winsys = 'xlib'
|
||||
elif default_platform in ('winddk',):
|
||||
default_statetrackers = 'none'
|
||||
default_drivers = 'softpipe,i915simple'
|
||||
default_winsys = 'none'
|
||||
else:
|
||||
default_x11 = 'no'
|
||||
default_drivers = 'all'
|
||||
default_winsys = 'all'
|
||||
|
||||
# TODO: auto-detect defaults
|
||||
opts = Options('config.py')
|
||||
@@ -47,23 +54,28 @@ opts.Add(EnumOption('machine', 'use machine-specific assembly code', 'x86',
|
||||
allowed_values=('generic', 'x86', 'x86-64')))
|
||||
opts.Add(EnumOption('platform', 'target platform', default_platform,
|
||||
allowed_values=('linux', 'cell', 'winddk')))
|
||||
opts.Add(ListOption('statetrackers', 'state_trackers to build', 'all',
|
||||
opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetrackers,
|
||||
[
|
||||
'mesa',
|
||||
],
|
||||
))
|
||||
#opts.Add(ListOption('drivers', 'pipe drivers to build', 'all',
|
||||
# [
|
||||
# 'softpipe',
|
||||
# 'failover',
|
||||
# 'i915simple',
|
||||
# 'i965simple',
|
||||
# 'cell',
|
||||
# ],
|
||||
# ))
|
||||
opts.Add(BoolOption('llvm', 'use llvm', False))
|
||||
opts.Add(BoolOption('dri', 'build dri drivers', False))
|
||||
opts.Add(BoolOption('x11', 'build x11 driver', default_x11))
|
||||
opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
|
||||
[
|
||||
'softpipe',
|
||||
'failover',
|
||||
'i915simple',
|
||||
'i965simple',
|
||||
'cell',
|
||||
],
|
||||
))
|
||||
opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
|
||||
[
|
||||
'xlib',
|
||||
'intel',
|
||||
],
|
||||
))
|
||||
opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
|
||||
opts.Add(BoolOption('dri', 'build DRI drivers', 'no'))
|
||||
|
||||
env = Environment(
|
||||
options = opts,
|
||||
@@ -106,7 +118,7 @@ Export([
|
||||
if platform == 'winddk':
|
||||
import ntpath
|
||||
escape = env['ESCAPE']
|
||||
env.Tool('msvc')
|
||||
env.Tool('winddk', '.')
|
||||
if 'BASEDIR' in os.environ:
|
||||
WINDDK = os.environ['BASEDIR']
|
||||
else:
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import os
|
||||
|
||||
Import('*')
|
||||
|
||||
env = env.Clone()
|
||||
@@ -20,15 +22,5 @@ SConscript([
|
||||
if llvm:
|
||||
SConscript(['auxiliary/gallivm/SConscript'])
|
||||
|
||||
SConscript([
|
||||
'drivers/softpipe/SConscript',
|
||||
'drivers/i915simple/SConscript',
|
||||
'drivers/failover/SConscript',
|
||||
])
|
||||
|
||||
if not msvc:
|
||||
SConscript(['drivers/i965simple/SConscript'])
|
||||
|
||||
#if cell:
|
||||
# SConscript(['drivers/cell/SConscript'])
|
||||
|
||||
for driver in env['drivers']:
|
||||
SConscript(os.path.join('drivers', driver, 'SConscript'))
|
||||
|
||||
@@ -5,7 +5,7 @@ if dri:
|
||||
'dri/SConscript',
|
||||
])
|
||||
|
||||
if env['x11'] and not dri and platform != 'winddk':
|
||||
if 'xlib' in env['drivers'] and not dri:
|
||||
SConscript([
|
||||
'xlib/SConscript',
|
||||
])
|
||||
|
||||
222
winddk.py
Normal file
222
winddk.py
Normal file
@@ -0,0 +1,222 @@
|
||||
"""engine.SCons.Tool.msvc
|
||||
|
||||
Tool-specific initialization for Microsoft Visual C/C++.
|
||||
|
||||
There normally shouldn't be any need to import this module directly.
|
||||
It will usually be imported through the generic SCons.Tool.Tool()
|
||||
selection method.
|
||||
|
||||
"""
|
||||
|
||||
#
|
||||
# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 The SCons Foundation
|
||||
#
|
||||
# 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, sublicense, 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 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
|
||||
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 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.
|
||||
#
|
||||
|
||||
__revision__ = "src/engine/SCons/Tool/msvc.py 2523 2007/12/12 09:37:41 knight"
|
||||
|
||||
import os.path
|
||||
import re
|
||||
import string
|
||||
|
||||
import SCons.Action
|
||||
import SCons.Builder
|
||||
import SCons.Errors
|
||||
import SCons.Platform.win32
|
||||
import SCons.Tool
|
||||
import SCons.Tool.mslib
|
||||
import SCons.Tool.mslink
|
||||
import SCons.Util
|
||||
import SCons.Warnings
|
||||
|
||||
CSuffixes = ['.c', '.C']
|
||||
CXXSuffixes = ['.cc', '.cpp', '.cxx', '.c++', '.C++']
|
||||
|
||||
def get_winddk_paths(env, version=None):
|
||||
"""Return a 3-tuple of (INCLUDE, LIB, PATH) as the values
|
||||
of those three environment variables that should be set
|
||||
in order to execute the MSVC tools properly."""
|
||||
|
||||
WINDDKdir = None
|
||||
exe_paths = []
|
||||
lib_paths = []
|
||||
include_paths = []
|
||||
|
||||
if 'BASEDIR' in os.environ:
|
||||
WINDDKdir = os.environ['BASEDIR']
|
||||
else:
|
||||
WINDDKdir = "C:\\WINDDK\\3790.1830"
|
||||
|
||||
exe_paths.append( os.path.join(WINDDKdir, 'bin') )
|
||||
exe_paths.append( os.path.join(WINDDKdir, 'bin\\x86') )
|
||||
include_paths.append( os.path.join(WINDDKdir, 'inc\\wxp') )
|
||||
lib_paths.append( os.path.join(WINDDKdir, 'lib') )
|
||||
|
||||
include_path = string.join( include_paths, os.pathsep )
|
||||
lib_path = string.join(lib_paths, os.pathsep )
|
||||
exe_path = string.join(exe_paths, os.pathsep )
|
||||
return (include_path, lib_path, exe_path)
|
||||
|
||||
def validate_vars(env):
|
||||
"""Validate the PCH and PCHSTOP construction variables."""
|
||||
if env.has_key('PCH') and env['PCH']:
|
||||
if not env.has_key('PCHSTOP'):
|
||||
raise SCons.Errors.UserError, "The PCHSTOP construction must be defined if PCH is defined."
|
||||
if not SCons.Util.is_String(env['PCHSTOP']):
|
||||
raise SCons.Errors.UserError, "The PCHSTOP construction variable must be a string: %r"%env['PCHSTOP']
|
||||
|
||||
def pch_emitter(target, source, env):
|
||||
"""Adds the object file target."""
|
||||
|
||||
validate_vars(env)
|
||||
|
||||
pch = None
|
||||
obj = None
|
||||
|
||||
for t in target:
|
||||
if SCons.Util.splitext(str(t))[1] == '.pch':
|
||||
pch = t
|
||||
if SCons.Util.splitext(str(t))[1] == '.obj':
|
||||
obj = t
|
||||
|
||||
if not obj:
|
||||
obj = SCons.Util.splitext(str(pch))[0]+'.obj'
|
||||
|
||||
target = [pch, obj] # pch must be first, and obj second for the PCHCOM to work
|
||||
|
||||
return (target, source)
|
||||
|
||||
def object_emitter(target, source, env, parent_emitter):
|
||||
"""Sets up the PCH dependencies for an object file."""
|
||||
|
||||
validate_vars(env)
|
||||
|
||||
parent_emitter(target, source, env)
|
||||
|
||||
if env.has_key('PCH') and env['PCH']:
|
||||
env.Depends(target, env['PCH'])
|
||||
|
||||
return (target, source)
|
||||
|
||||
def static_object_emitter(target, source, env):
|
||||
return object_emitter(target, source, env,
|
||||
SCons.Defaults.StaticObjectEmitter)
|
||||
|
||||
def shared_object_emitter(target, source, env):
|
||||
return object_emitter(target, source, env,
|
||||
SCons.Defaults.SharedObjectEmitter)
|
||||
|
||||
pch_action = SCons.Action.Action('$PCHCOM', '$PCHCOMSTR')
|
||||
pch_builder = SCons.Builder.Builder(action=pch_action, suffix='.pch',
|
||||
emitter=pch_emitter,
|
||||
source_scanner=SCons.Tool.SourceFileScanner)
|
||||
res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
|
||||
res_builder = SCons.Builder.Builder(action=res_action,
|
||||
src_suffix='.rc',
|
||||
suffix='.res',
|
||||
src_builder=[],
|
||||
source_scanner=SCons.Tool.SourceFileScanner)
|
||||
SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan)
|
||||
|
||||
def generate(env):
|
||||
"""Add Builders and construction variables for MSVC++ to an Environment."""
|
||||
static_obj, shared_obj = SCons.Tool.createObjBuilders(env)
|
||||
|
||||
for suffix in CSuffixes:
|
||||
static_obj.add_action(suffix, SCons.Defaults.CAction)
|
||||
shared_obj.add_action(suffix, SCons.Defaults.ShCAction)
|
||||
static_obj.add_emitter(suffix, static_object_emitter)
|
||||
shared_obj.add_emitter(suffix, shared_object_emitter)
|
||||
|
||||
for suffix in CXXSuffixes:
|
||||
static_obj.add_action(suffix, SCons.Defaults.CXXAction)
|
||||
shared_obj.add_action(suffix, SCons.Defaults.ShCXXAction)
|
||||
static_obj.add_emitter(suffix, static_object_emitter)
|
||||
shared_obj.add_emitter(suffix, shared_object_emitter)
|
||||
|
||||
env['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Z7") or ""}'])
|
||||
env['CCPCHFLAGS'] = SCons.Util.CLVar(['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'])
|
||||
env['CCCOMFLAGS'] = '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS'
|
||||
env['CC'] = 'cl'
|
||||
env['CCFLAGS'] = SCons.Util.CLVar('/nologo')
|
||||
env['CFLAGS'] = SCons.Util.CLVar('')
|
||||
env['CCCOM'] = '$CC $CFLAGS $CCFLAGS $CCCOMFLAGS'
|
||||
env['SHCC'] = '$CC'
|
||||
env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
|
||||
env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
|
||||
env['SHCCCOM'] = '$SHCC $SHCFLAGS $SHCCFLAGS $CCCOMFLAGS'
|
||||
env['CXX'] = '$CC'
|
||||
env['CXXFLAGS'] = SCons.Util.CLVar('$CCFLAGS $( /TP $)')
|
||||
env['CXXCOM'] = '$CXX $CXXFLAGS $CCCOMFLAGS'
|
||||
env['SHCXX'] = '$CXX'
|
||||
env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
|
||||
env['SHCXXCOM'] = '$SHCXX $SHCXXFLAGS $CCCOMFLAGS'
|
||||
env['CPPDEFPREFIX'] = '/D'
|
||||
env['CPPDEFSUFFIX'] = ''
|
||||
env['INCPREFIX'] = '/I'
|
||||
env['INCSUFFIX'] = ''
|
||||
# env.Append(OBJEMITTER = [static_object_emitter])
|
||||
# env.Append(SHOBJEMITTER = [shared_object_emitter])
|
||||
env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
|
||||
|
||||
env['RC'] = 'rc'
|
||||
env['RCFLAGS'] = SCons.Util.CLVar('')
|
||||
env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES'
|
||||
env['BUILDERS']['RES'] = res_builder
|
||||
env['OBJPREFIX'] = ''
|
||||
env['OBJSUFFIX'] = '.obj'
|
||||
env['SHOBJPREFIX'] = '$OBJPREFIX'
|
||||
env['SHOBJSUFFIX'] = '$OBJSUFFIX'
|
||||
|
||||
try:
|
||||
include_path, lib_path, exe_path = get_winddk_paths(env)
|
||||
|
||||
# since other tools can set these, we just make sure that the
|
||||
# relevant stuff from MSVS is in there somewhere.
|
||||
env.PrependENVPath('INCLUDE', include_path)
|
||||
env.PrependENVPath('LIB', lib_path)
|
||||
env.PrependENVPath('PATH', exe_path)
|
||||
except (SCons.Util.RegError, SCons.Errors.InternalError):
|
||||
pass
|
||||
|
||||
env['CFILESUFFIX'] = '.c'
|
||||
env['CXXFILESUFFIX'] = '.cc'
|
||||
|
||||
env['PCHPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Yd") or ""}'])
|
||||
env['PCHCOM'] = '$CXX $CXXFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo${TARGETS[1]} /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS $PCHPDBFLAGS'
|
||||
env['BUILDERS']['PCH'] = pch_builder
|
||||
|
||||
env['AR'] = 'lib'
|
||||
env['ARFLAGS'] = SCons.Util.CLVar('/nologo')
|
||||
env['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES')}"
|
||||
env['LIBPREFIX'] = ''
|
||||
env['LIBSUFFIX'] = '.lib'
|
||||
|
||||
SCons.Tool.mslink.generate(env)
|
||||
|
||||
if not env.has_key('ENV'):
|
||||
env['ENV'] = {}
|
||||
if not env['ENV'].has_key('SystemRoot'): # required for dlls in the winsxs folders
|
||||
env['ENV']['SystemRoot'] = SCons.Platform.win32.get_system_root()
|
||||
|
||||
def exists(env):
|
||||
return env.Detect('cl')
|
||||
|
||||
Reference in New Issue
Block a user