0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Selectively enable content signatures at binary-build time...

Browse source 
...but not installation time.  This avaoid the weird install crash
bug.
This commit is contained in:
Eric S. Raymond 2008-03-27 11:30:40 +00:00
parent 59deff29d4
commit 66a696025b
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
SConstruct
View file

@ -53,6 +53,8 @@ all = env.Alias("all", ["wesnoth", "wesnoth_editor", "wesnothd", "campaignd",
"cutter", "exploder"])
env.Default("all")
env.TargetSignatures('content')
#
# Configuration
#
@ -457,13 +459,9 @@ env.Depends('src/game_config.o', 'src/revision.hpp')
r = env.Command("src/revision.hpp", [],
lambda target, source, env: open(str(target[0]), "w").write("#define REVISION \"%s\"\n" % env["svnrev"]))
env.AlwaysBuild(r)
env.TargetSignatures('content')
# Don't do this! It looks tempting, because you could in theory prevent
# a recompile-relink when revision.h gets remade with a later timestamp
# but the same content. Unfortunately doing this causes a crash in the
# install production, at least in scons 0.97, right after the actions
# finish (thus, probably, at target-signature generation time).
#env.TargetSignatures('content')
@ -639,11 +637,16 @@ daemons = [wesnothd, campaignd]
pythontools = Split("wmlscope wmllint wmlindent")
pythonmodules = Split("wmltools.py wmlparser.py wmldata.py wmliterator.py campaignserver_client.py libsvn.py __init__.py")
install_env = env.Clone()
# TargetSignatures('content') causes a crash in the install
# production, at least in scons 0.97, right after the actions finish
# (thus, probably, at target-signature generation time).
install_env.TargetSignatures('build')
env.Alias('install', [
env.Install(bindir, clientside),
env.Install(bindir, map(lambda tool : 'data/tools/' + tool, pythontools)),
env.Install(pythonlib, map(lambda module : 'data/tools/wesnoth/' + module, pythonmodules)),
env.Install(datadir, Split('data fonts icons images sounds'))
install_env.Install(bindir, clientside),
install_env.Install(bindir, map(lambda tool : 'data/tools/' + tool, pythontools)),
install_env.Install(pythonlib, map(lambda module : 'data/tools/wesnoth/' + module, pythonmodules)),
install_env.Install(datadir, Split('data fonts icons images sounds'))
])
env.Alias("install-wesnothd", env.Clone().Install(bindir, wesnothd))