Mesa (master): scons: Propagate installation targets.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Tue Nov 2 14:20:30 UTC 2010
Module: Mesa
Branch: master
Commit: 265b53983e5100420847d3d2c086409fc9ca8e17
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=265b53983e5100420847d3d2c086409fc9ca8e17
Author: José Fonseca <jfonseca at vmware.com>
Date: Tue Nov 2 14:20:12 2010 +0000
scons: Propagate installation targets.
Fixes libgl-xlib target.
---
scons/gallium.py | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index 194b152..3c0ff90 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -50,29 +50,34 @@ def symlink(target, source, env):
def install(env, source, subdir):
target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build_dir'], subdir)
- env.Install(target_dir, source)
+ return env.Install(target_dir, source)
def install_program(env, source):
- install(env, source, 'bin')
+ return install(env, source, 'bin')
def install_shared_library(env, sources, version = ()):
+ targets = []
install_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build_dir'])
version = tuple(map(str, version))
if env['SHLIBSUFFIX'] == '.dll':
dlls = env.FindIxes(sources, 'SHLIBPREFIX', 'SHLIBSUFFIX')
- install(env, dlls, 'bin')
+ targets += install(env, dlls, 'bin')
libs = env.FindIxes(sources, 'LIBPREFIX', 'LIBSUFFIX')
- install(env, libs, 'lib')
+ targets += install(env, libs, 'lib')
else:
for source in sources:
target_dir = os.path.join(install_dir, 'lib')
target_name = '.'.join((str(source),) + version)
last = env.InstallAs(os.path.join(target_dir, target_name), source)
+ targets += last
while len(version):
version = version[:-1]
target_name = '.'.join((str(source),) + version)
action = SCons.Action.Action(symlink, "$TARGET -> $SOURCE")
last = env.Command(os.path.join(target_dir, target_name), last, action)
+ targets += last
+ return targets
+
def createInstallMethods(env):
env.AddMethod(install_program, 'InstallProgram')
More information about the mesa-commit
mailing list