summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-01-01 21:55:08 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-01-02 00:01:42 +0000
commit2104cbb6947645614e99319edb3b6502535066ee (patch)
tree5bb450b9f49db1addd043dede8f76b4f4932e10b
parentb2e40643a328e4a60c04acf3e3079befb813c705 (diff)
scons: Remove duplicated code.
-rw-r--r--scons/custom.py31
1 files changed, 0 insertions, 31 deletions
diff --git a/scons/custom.py b/scons/custom.py
index e9c90d09991..572b963388a 100644
--- a/scons/custom.py
+++ b/scons/custom.py
@@ -149,36 +149,6 @@ def createCodeGenerateMethod(env):
env.AddMethod(code_generate, 'CodeGenerate')
-def symlink(target, source, env):
- target = str(target[0])
- source = str(source[0])
- if os.path.islink(target) or os.path.exists(target):
- os.remove(target)
- os.symlink(os.path.basename(source), target)
-
-def install_program(env, source):
- source = str(source[0])
- target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build'], 'bin')
- target_name = str(source)
- env.InstallAs(os.path.join(target_dir, target_name), source)
-
-def install_shared_library(env, source, version = ()):
- source = str(source[0])
- version = tuple(map(str, version))
- target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build'], 'lib')
- target_name = '.'.join((str(source),) + version)
- last = env.InstallAs(os.path.join(target_dir, target_name), source)
- 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)
-
-def createInstallMethods(env):
- env.AddMethod(install_program, 'InstallProgram')
- env.AddMethod(install_shared_library, 'InstallSharedLibrary')
-
-
def generate(env):
"""Common environment generation code"""
@@ -188,7 +158,6 @@ def generate(env):
# Custom builders and methods
createConvenienceLibBuilder(env)
createCodeGenerateMethod(env)
- createInstallMethods(env)
# for debugging
#print env.Dump()