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

Converted remaining installation productions to use InstallData.

Browse source
This commit is contained in:
Sergey Popov 2008-10-16 21:58:53 +00:00
parent a17705b185
commit b087aec475
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SConstruct
View file

@ -443,20 +443,15 @@ def InstallManpages(env, component):
env.InstallData("mandir", component, os.path.join("doc", "man", component + ".6"), "man6")
for lingua in linguas:
manpage = os.path.join("doc", "man", lingua, component + ".6")
if os.path.exists(manpage):
env.InstallData("mandir", component, manpage, os.path.join(lingua, "man6"))
env.InstallData("mandir", component, manpage, os.path.join(lingua, "man6"))
# Now the actual installation productions
install_data = env.InstallFiltered(Dir(env.subst(datadir)),
map(Dir, installable_subs))
install_manual = env.InstallFiltered(Dir(env.subst(docdir)),
Dir("doc/manual"))
env.AlwaysBuild(install_data, install_manual)
env.InstallData("datadir", "wesnoth", map(Dir, installable_subs))
env.InstallData("docdir", "wesnoth", Dir("doc/manual"))
# The game and associated resources
env.Alias("install-wesnoth", [env.InstallWithSuffix(bindir, wesnoth), install_data, install_manual])
env.Alias("install-wesnoth", env.InstallWithSuffix(bindir, wesnoth))
InstallManpages(env, "wesnoth")
if have_client_prereqs and have_X and env["desktop_entry"]:
if sys.platform == "darwin":
@ -466,12 +461,8 @@ if have_client_prereqs and have_X and env["desktop_entry"]:
env.InstallData("desktopdir", "wesnoth", "icons/wesnoth.desktop")
# Python tools
env.Alias("install-pytools", [
env.Install(bindir,
map(lambda tool: 'data/tools/' + tool, pythontools)),
env.Install(python_site_packages_dir,
map(lambda module: 'data/tools/wesnoth/' + module, pythonmodules)),
])
env.InstallData("bindir", "pytools", map(lambda tool: os.path.join("data", "tools", tool), pythontools))
env.InstallData("python_site_packages_dir", "pytools", map(lambda module: os.path.join("data", "tools", "wesnoth", module), pythonmodules))
# Wesnoth MP server install
install_wesnothd = env.InstallWithSuffix(bindir, wesnothd)

15
scons/install.py
View file

@ -70,8 +70,19 @@ HardLink = ActionFactory(hard_link,
lambda dest, src: 'Hardlinking %s to %s' % (src, dest))
def InstallData(env, datadir, component, source, subdir = ""):
installdir = os.path.join(env["destdir"], env[datadir].lstrip("/"), subdir)
env.Alias("install-" + component, env.Install(installdir, source))
installdir = Dir(env.subst(os.path.join(env["destdir"], env[datadir].lstrip("/"), subdir)))
sources = map(str, Flatten(env.subst(source)))
dirs = []
for source in sources:
if os.path.exists(source):
if os.path.isfile(source):
env.Alias("install-" + component, env.Install(installdir, source))
else:
dirs.append(Dir(source))
if dirs:
install = env.InstallFiltered(installdir, dirs)
AlwaysBuild(install)
env.Alias("install-" + component, install)
def generate(env):
#env.AddMethod(InstallWithSuffix)