diff options
author | Andrew Tridgell <tridge@samba.org> | 2010-04-01 22:19:32 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:22 +1000 |
commit | ba64e236d59619cb4222225ac98efe2a2c07f592 (patch) | |
tree | 31b1e68de951d9acb935a5d8ee17281815c8e5ac /buildtools/wafsamba/samba_deps.py | |
parent | 6dbf576e819d32d2a25e7e1fa7ac50d5764db966 (diff) | |
download | samba-ba64e236d59619cb4222225ac98efe2a2c07f592.tar.gz samba-ba64e236d59619cb4222225ac98efe2a2c07f592.tar.bz2 samba-ba64e236d59619cb4222225ac98efe2a2c07f592.zip |
build: much simpler and faster rpath install handler
This avoids creating additional task generators at build time, and
instead moves all the rpath logic into samba_install.py where it is
triggered by the install_lib and install_bin features
Diffstat (limited to 'buildtools/wafsamba/samba_deps.py')
-rw-r--r-- | buildtools/wafsamba/samba_deps.py | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 3c5c327c1d..a05092f525 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -310,13 +310,6 @@ def add_samba_attributes(bld, tgt_list): t.samba_deps_extended = t.samba_deps[:] t.samba_includes_extended = TO_LIST(t.samba_includes)[:] t.ccflags = getattr(t, 'samba_cflags', '') - install_target = getattr(t, 'install_target', None) - if Options.is_install and install_target: - t2 = bld.name_to_obj(install_target, bld.env) - t2.sname = install_target - t2.samba_type = t.samba_type - t2.samba_abspath = t2.path.abspath(bld.env) - t2.ccflags = t.ccflags def build_direct_deps(bld, tgt_list): @@ -784,23 +777,15 @@ def load_samba_deps(bld, tgt_list): #print '%s: \ntdeps=%s \nodeps=%s' % (t.sname, tdeps, olddeps) return False - tgt_list_extended = tgt_list[:] - if Options.is_install: - for t in tgt_list: - install_target = getattr(t, 'install_target', None) - if install_target: - t2 = bld.name_to_obj(install_target, bld.env) - tgt_list_extended.append(t2) - # put outputs in place - for t in tgt_list_extended: + for t in tgt_list: if not t.sname in denv.output: continue tdeps = denv.output[t.sname] for a in tdeps: setattr(t, a, tdeps[a]) # put output env vars in place - for t in tgt_list_extended: + for t in tgt_list: if not t.sname in denv.outenv: continue tdeps = denv.outenv[t.sname] for a in tdeps: @@ -811,32 +796,6 @@ def load_samba_deps(bld, tgt_list): -def add_install_deps(bld, tgt_list): - '''add attributes for install libs/binaries - - This ensures that all the install targets have identical dependencies - to the build targets. - ''' - if not Options.is_install: - return - - for t in tgt_list[:]: - install_target = getattr(t, 'install_target', None) - if install_target: - t2 = bld.name_to_obj(install_target, bld.env) - if not t2: - print('install_target %s not found for %s' % (install_target, t.sname)) - sys.exit(1) - tgt_list.append(t2) - for attr in savedeps_outputs: - v = getattr(t, attr, None) - if v: - setattr(t2, attr, v) - for attr in savedeps_outenv: - if attr in t.env: - t2.env[attr] = t.env[attr] - - def check_project_rules(bld): '''check the project rules - ensuring the targets are sane''' @@ -847,8 +806,6 @@ def check_project_rules(bld): # build a list of task generators we are interested in tgt_list = [] for tgt in targets: - if tgt.endswith('.inst'): - continue type = targets[tgt] if not type in ['SUBSYSTEM', 'MODULE', 'BINARY', 'LIBRARY', 'ASN1', 'PYTHON']: continue @@ -861,7 +818,6 @@ def check_project_rules(bld): add_samba_attributes(bld, tgt_list) if load_samba_deps(bld, tgt_list): - add_install_deps(bld, tgt_list) return print "Checking project rules ..." @@ -893,8 +849,6 @@ def check_project_rules(bld): save_samba_deps(bld, tgt_list) - add_install_deps(bld, tgt_list) - print "Project rules pass" |