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

Fix #3809 : add option to control use of autorevision to scons

Browse source
This commit is contained in:
loonycyborg 2018-12-27 14:39:31 +03:00
parent f6a32792d0
commit 5164cd030f
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
SConstruct
View file

@ -112,6 +112,7 @@ opts.AddVariables(
EnumVariable('cxx_std', 'Target c++ std version', '14', ['14', '17']), EnumVariable('cxx_std', 'Target c++ std version', '14', ['14', '17']),
('sanitize', 'Enable clang and GCC sanitizer functionality. A comma separated list of sanitize suboptions must be passed as value.', ''), ('sanitize', 'Enable clang and GCC sanitizer functionality. A comma separated list of sanitize suboptions must be passed as value.', ''),
BoolVariable("fast", "Make scons faster at cost of less precise dependency tracking.", False), BoolVariable("fast", "Make scons faster at cost of less precise dependency tracking.", False),
BoolVariable("autorevision", 'Use autorevision tool to fetch current git revision that will be embedded in version string', True),
BoolVariable("lockfile", "Create a lockfile to prevent multiple instances of scons from being run at the same time on this working copy.", False), BoolVariable("lockfile", "Create a lockfile to prevent multiple instances of scons from being run at the same time on this working copy.", False),
BoolVariable("OS_ENV", "Forward the entire OS environment to scons", False), BoolVariable("OS_ENV", "Forward the entire OS environment to scons", False),
BoolVariable("history", "Clear to disable GNU history support in lua console", True) BoolVariable("history", "Clear to disable GNU history support in lua console", True)
@ -627,13 +628,14 @@ for env in [test_env, client_env, env]:
if not env['static_test']: if not env['static_test']:
test_env.Append(CPPDEFINES = "BOOST_TEST_DYN_LINK") test_env.Append(CPPDEFINES = "BOOST_TEST_DYN_LINK")
try: if env['autorevision']:
if call(env.subst("utils/autorevision.sh -t h > $build_dir/revision.h"), shell=True) == 0: try:
env["have_autorevision"] = True if call(env.subst("utils/autorevision.sh -t h > $build_dir/revision.h"), shell=True) == 0:
if not call(env.subst("cmp -s $build_dir/revision.h src/revision.h"), shell=True) == 0: env["have_autorevision"] = True
call(env.subst("cp $build_dir/revision.h src/revision.h"), shell=True) if not call(env.subst("cmp -s $build_dir/revision.h src/revision.h"), shell=True) == 0:
except: call(env.subst("cp $build_dir/revision.h src/revision.h"), shell=True)
pass except:
pass
Export(Split("env client_env test_env have_client_prereqs have_server_prereqs have_test_prereqs")) Export(Split("env client_env test_env have_client_prereqs have_server_prereqs have_test_prereqs"))
SConscript(dirs = Split("po doc packaging/windows packaging/systemd")) SConscript(dirs = Split("po doc packaging/windows packaging/systemd"))