OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Propagate installation targets.

Browse Source 
Fixes libgl-xlib target.
This commit is contained in:
José Fonseca
2010-11-02 14:20:12 +00:00
parent 45f4b85d58
commit 265b53983e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scons/gallium.py
View File

@@ -50,29 +50,34 @@ def symlink(target, source, env):
def install(env, source, subdir): def install(env, source, subdir):
target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build_dir'], 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): def install_program(env, source):
install(env, source, 'bin') return install(env, source, 'bin')
def install_shared_library(env, sources, version = ()): def install_shared_library(env, sources, version = ()):
targets = []
install_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build_dir']) install_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build_dir'])
version = tuple(map(str, version)) version = tuple(map(str, version))
if env['SHLIBSUFFIX'] == '.dll': if env['SHLIBSUFFIX'] == '.dll':
dlls = env.FindIxes(sources, 'SHLIBPREFIX', 'SHLIBSUFFIX') dlls = env.FindIxes(sources, 'SHLIBPREFIX', 'SHLIBSUFFIX')
install(env, dlls, 'bin') targets += install(env, dlls, 'bin')
libs = env.FindIxes(sources, 'LIBPREFIX', 'LIBSUFFIX') libs = env.FindIxes(sources, 'LIBPREFIX', 'LIBSUFFIX')
install(env, libs, 'lib') targets += install(env, libs, 'lib')
else: else:
for source in sources: for source in sources:
target_dir = os.path.join(install_dir, 'lib') target_dir = os.path.join(install_dir, 'lib')
target_name = '.'.join((str(source),) + version) target_name = '.'.join((str(source),) + version)
last = env.InstallAs(os.path.join(target_dir, target_name), source) last = env.InstallAs(os.path.join(target_dir, target_name), source)
targets += last
while len(version): while len(version):
version = version[:-1] version = version[:-1]
target_name = '.'.join((str(source),) + version) target_name = '.'.join((str(source),) + version)
action = SCons.Action.Action(symlink, "$TARGET -> $SOURCE") action = SCons.Action.Action(symlink, "$TARGET -> $SOURCE")
last = env.Command(os.path.join(target_dir, target_name), last, action) last = env.Command(os.path.join(target_dir, target_name), last, action)
targets += last
return targets
def createInstallMethods(env): def createInstallMethods(env):
env.AddMethod(install_program, 'InstallProgram') env.AddMethod(install_program, 'InstallProgram')