SCons: use two existing modules for integrating DistCC and CCache
This commit is contained in:
parent
359144c528
commit
7a64f37643
6 changed files with 367 additions and 191 deletions
12
SConstruct
12
SConstruct
|
|
@ -64,14 +64,12 @@ def setupBasicEnvironment():
|
|||
,toolpath = [TOOLDIR]
|
||||
,tools = ["default", "BuilderGCH", "BuilderDoxygen"]
|
||||
)
|
||||
env.Tool("ToolDistCC")
|
||||
env.Tool("ToolCCache")
|
||||
handleVerboseMessages(env)
|
||||
|
||||
env.Append ( CCCOM=' -std=gnu99')
|
||||
env.Append ( SHCCCOM=' -std=gnu99') # workaround for a bug: CCCOM currently doesn't honour CFLAGS, only CCFLAGS
|
||||
env.Replace( SETCC=env.subst('$SETCC '))
|
||||
env.Replace( CC=env['SETCC']) # possibly using another compiler command...
|
||||
env.Replace( SETCXX=env.subst('$SETCXX '))
|
||||
env.Replace( CXX=env['SETCXX'])
|
||||
env.Replace( VERSION=VERSION
|
||||
, SRCDIR=SRCDIR
|
||||
, BINDIR=BINDIR
|
||||
|
|
@ -147,8 +145,10 @@ def defineCmdlineOptions():
|
|||
opts = Options([OPTIONSCACHEFILE, CUSTOPTIONSFILE])
|
||||
opts.AddOptions(
|
||||
('ARCHFLAGS', 'Set architecture-specific compilation flags (passed literally to gcc)','')
|
||||
,('SETCC', 'Set the C compiler to use. (you can use $CC to refer to the default)','$CC')
|
||||
,('SETCXX', 'Set the C++ compiler to use. (you can refer to $CXX)','$CXX')
|
||||
,('CC', 'Set the C compiler to use.', 'gcc')
|
||||
,('CXX', 'Set the C++ compiler to use.', 'g++')
|
||||
,PathOption('CCACHE', 'Integrate with CCache', '', PathOption.PathAccept)
|
||||
,PathOption('DISTCC', 'Invoke C/C++ compiler commands through DistCC', '', PathOption.PathAccept)
|
||||
,EnumOption('BUILDLEVEL', 'NoBug build level for debugging', 'ALPHA',
|
||||
allowed_values=('ALPHA', 'BETA', 'RELEASE'))
|
||||
,BoolOption('DEBUG', 'Build with debugging information and no optimisations', False)
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ from fnmatch import fnmatch
|
|||
|
||||
|
||||
def DoxyfileParse(file_contents):
|
||||
"""
|
||||
Parse a Doxygen source file and return a dictionary of all the values.
|
||||
""" Parse a Doxygen source file and return a dictionary of all the values.
|
||||
Values will be strings and lists of strings.
|
||||
"""
|
||||
data = {}
|
||||
|
|
@ -99,10 +98,11 @@ def DoxyfileParse(file_contents):
|
|||
|
||||
return data
|
||||
|
||||
|
||||
def DoxySourceScan(node, env, path):
|
||||
"""
|
||||
Doxygen Doxyfile source scanner. This should scan the Doxygen file and add
|
||||
any files used to generate docs to the list of source files.
|
||||
""" Doxygen Doxyfile source scanner.
|
||||
This should scan the Doxygen file and add any files
|
||||
used to generate docs to the list of source files.
|
||||
"""
|
||||
default_file_patterns = [
|
||||
'*.c', '*.cc', '*.cxx', '*.cpp', '*.c++', '*.java', '*.ii', '*.ixx',
|
||||
|
|
@ -128,10 +128,9 @@ def DoxySourceScan(node, env, path):
|
|||
exclude_patterns = data.get("EXCLUDE_PATTERNS", default_exclude_patterns)
|
||||
|
||||
#
|
||||
# We're running in the top-level directory, but the doxygen
|
||||
# configuration file is in the same directory as node; this means
|
||||
# that relative pathnames in node must be adjusted before they can
|
||||
# go onto the sources list
|
||||
# We're running in the top-level directory, but the doxygen configuration file
|
||||
# is in the same directory as node; this means that relative pathnames in node
|
||||
# must be adjusted before they can go onto the sources list
|
||||
conf_dir = os.path.dirname(str(node))
|
||||
|
||||
for node in data.get("INPUT", []):
|
||||
|
|
@ -162,6 +161,7 @@ def DoxySourceScanCheck(node, env):
|
|||
""" Check if we should scan this file """
|
||||
return os.path.isfile(node.path)
|
||||
|
||||
|
||||
def DoxyEmitter(source, target, env):
|
||||
""" Doxygen Doxyfile emitter """
|
||||
# possible output formats and their default values and output locations
|
||||
|
|
@ -195,8 +195,7 @@ def DoxyEmitter(source, target, env):
|
|||
|
||||
|
||||
def generate(env):
|
||||
"""
|
||||
Add builders and construction variables for the
|
||||
""" Add builders and construction variables for the
|
||||
Doxygen tool. This is currently for Doxygen 1.4.6.
|
||||
"""
|
||||
doxyfile_scanner = env.Scanner(
|
||||
|
|
@ -222,9 +221,9 @@ def generate(env):
|
|||
DOXYGEN = 'doxygen',
|
||||
)
|
||||
|
||||
|
||||
def exists(env):
|
||||
"""
|
||||
Make sure doxygen exists.
|
||||
""" Make sure doxygen exists.
|
||||
"""
|
||||
return env.Detect("doxygen")
|
||||
|
||||
|
|
|
|||
|
|
@ -73,9 +73,9 @@ def shared_pch_emitter(target,source,env):
|
|||
setup_dependency(target,source,env, key='GCH-sh')
|
||||
return (target, source)
|
||||
|
||||
|
||||
def generate(env):
|
||||
"""
|
||||
Add builders and construction variables for the Gch builder.
|
||||
""" Add builders and construction variables for the Gch builder.
|
||||
"""
|
||||
env.Append(BUILDERS = {
|
||||
'gch': env.Builder(
|
||||
|
|
|
|||
|
|
@ -115,6 +115,42 @@ def getDirname(dir):
|
|||
|
||||
|
||||
|
||||
def checkCommandOption(env, optID, val=None, cmdName=None):
|
||||
""" evaluate and verify an option, which may point at a command.
|
||||
besides specifying a path, the option may read True, yes or 1,
|
||||
denoting that the system default for this command should be used.
|
||||
@return: True, if the key has been expanded and validated,
|
||||
False, if this failed and the key was removed
|
||||
"""
|
||||
if not val:
|
||||
if not env.get(optID): return False
|
||||
else:
|
||||
val = env.get(optID)
|
||||
|
||||
if val=='True' or val=='true' or val=='yes' or val=='1' or val == 1 :
|
||||
if not cmdName:
|
||||
print "WARNING: no default for %s, please specify a full path." % optID
|
||||
del env[optID]
|
||||
return False
|
||||
else:
|
||||
val = env.WhereIs(cmdName)
|
||||
if not val:
|
||||
print "WARNING: %s not found, please specify a full path" % cmdName
|
||||
del env[optID]
|
||||
return False
|
||||
|
||||
if not os.path.isfile(val):
|
||||
val = env.WhereIs(val)
|
||||
|
||||
if val and os.path.isfile(val):
|
||||
env[optID] = val
|
||||
return True
|
||||
else:
|
||||
del env[optID]
|
||||
return False
|
||||
|
||||
|
||||
|
||||
def RegisterIcon_Builder(env, renderer):
|
||||
""" Registers Custom Builders for generating and installing Icons.
|
||||
Additionally you need to build the tool (rsvg-convert.c)
|
||||
|
|
|
|||
76
admin/scons/ToolCCache.py
Normal file
76
admin/scons/ToolCCache.py
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
# -*- python -*-
|
||||
##
|
||||
## ToolCCache.py - SCons tool for integrating with CCache compiler cache
|
||||
##
|
||||
|
||||
# Copyright (C) Lumiera.org and FreeOrion.org
|
||||
# 2008, Hermann Vosseler <Ichthyostega@web.de>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation; either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
#####################################################################
|
||||
|
||||
# This SCons builder was extracted from http://www.freeorion.org/
|
||||
# FreeOrion is an open-source platform-independent galactic conquest game
|
||||
#
|
||||
# history: 12/2008 adapted for Lumiera build system
|
||||
|
||||
|
||||
import os
|
||||
from Buildhelper import *
|
||||
|
||||
|
||||
def generate(env):
|
||||
""" Modify the environment such as to redirect any
|
||||
C/C++ compiler invocations through CCache, while using
|
||||
CCache config variables found in the os.environment.
|
||||
"""
|
||||
if not exists(env): return
|
||||
|
||||
assert env['CCACHE']
|
||||
if not env['CCACHE'] in env['CC']:
|
||||
env['CC'] = env.subst('$CCACHE $CC')
|
||||
if not env['CCACHE'] in env['CXX']:
|
||||
env['CXX'] = env.subst('$CCACHE $CXX')
|
||||
print env.subst("* Build using $CCACHE")
|
||||
|
||||
for i in ['HOME'
|
||||
,'CCACHE_DIR'
|
||||
,'CCACHE_TEMPDIR'
|
||||
,'CCACHE_LOGFILE'
|
||||
,'CCACHE_PATH'
|
||||
,'CCACHE_CC'
|
||||
,'CCACHE_CPP2'
|
||||
,'CCACHE_PREFIX'
|
||||
,'CCACHE_DISABLE'
|
||||
,'CCACHE_READONLY'
|
||||
,'CCACHE_NOSTATS'
|
||||
,'CCACHE_NLEVELS'
|
||||
,'CCACHE_HARDLINK'
|
||||
,'CCACHE_RECACHE'
|
||||
,'CCACHE_UMASK'
|
||||
,'CCACHE_HASHDIR'
|
||||
,'CCACHE_UNIFY'
|
||||
,'CCACHE_EXTENSION'
|
||||
]:
|
||||
if os.environ.has_key(i) and not env.has_key(i):
|
||||
env['ENV'][i] = os.environ[i]
|
||||
|
||||
|
||||
|
||||
def exists(env):
|
||||
""" Ensure CCache is available.
|
||||
"""
|
||||
return checkCommandOption(env, 'CCACHE', cmdName='ccache')
|
||||
|
||||
65
admin/scons/ToolDistCC.py
Normal file
65
admin/scons/ToolDistCC.py
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
# -*- python -*-
|
||||
##
|
||||
## ToolDistCC.py - SCons tool for distributed compilation using DistCC
|
||||
##
|
||||
|
||||
# Copyright (C) Lumiera.org and FreeOrion.org
|
||||
# 2008, Hermann Vosseler <Ichthyostega@web.de>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation; either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
#####################################################################
|
||||
|
||||
# This SCons builder was extracted from http://www.freeorion.org/
|
||||
# FreeOrion is an open-source platform-independent galactic conquest game
|
||||
#
|
||||
# history: 12/2008 adapted for Lumiera build system
|
||||
|
||||
|
||||
import os
|
||||
from Buildhelper import *
|
||||
|
||||
|
||||
def generate(env):
|
||||
""" Modify the environment such as to redirect any
|
||||
C/C++ compiler invocations through DistCC. Additionally
|
||||
pull in the environment config variables used by DistCC
|
||||
"""
|
||||
if not exists(env): return
|
||||
|
||||
assert env['DISTCC']
|
||||
if not env['DISTCC'] in env['CC']:
|
||||
env['CC'] = env.subst('$DISTCC $CC')
|
||||
if not env['DISTCC'] in env['CXX']:
|
||||
env['CXX'] = env.subst('$DISTCC $CXX')
|
||||
print env.subst("* Build using $DISTCC")
|
||||
for i in ['HOME'
|
||||
,'DISTCC_HOSTS'
|
||||
,'DISTCC_VERBOSE'
|
||||
,'DISTCC_FALLBACK'
|
||||
,'DISTCC_LOG'
|
||||
,'DISTCC_MMAP'
|
||||
,'DISTCC_SAVE_TEMPS'
|
||||
,'DISTCC_TCP_CORK'
|
||||
,'DISTCC_SSH'
|
||||
]:
|
||||
if os.environ.has_key(i) and not env.has_key(i):
|
||||
env['ENV'][i] = os.environ[i]
|
||||
|
||||
|
||||
def exists(env):
|
||||
""" Ensure DistCC exists.
|
||||
"""
|
||||
return checkCommandOption(env, 'DISTCC', cmdName='distcc')
|
||||
|
||||
Loading…
Reference in a new issue