summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Nagy <tnagy2pow10@gmail.com>2010-05-22 14:35:50 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-23 17:51:06 +0200
commitbd8e3cf85586c9d2fadef40c861221073923c91c (patch)
treecba0a88b4fcd229e5e9b022daf3fea8463f3de42
parent6e7d39f4dd29d090244a51df9f59a42d7cb060d5 (diff)
downloadsamba-bd8e3cf85586c9d2fadef40c861221073923c91c.tar.gz
samba-bd8e3cf85586c9d2fadef40c861221073923c91c.tar.bz2
samba-bd8e3cf85586c9d2fadef40c861221073923c91c.zip
Substitute the pidl files without using 'headermap.txt'
The headers generated by pidl contain references to bin/default. Those paths may be replaced automatically. Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
-rw-r--r--buildtools/wafsamba/wafsamba.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 0893eacffd..1efa10d4f0 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -660,9 +660,17 @@ def init_subst(bld):
if not node:
return {}
lines = node.read(None)
- bld.subst_table_h = hash(lines)
+
lines = [x.strip().split(': ') for x in lines.split('\n') if x.rfind(': ') > -1]
bld.subst_table = dict(lines)
+
+ # pidl file replacement (all of this is temporary, one step at a time)
+ keyz = list(bld.subst_table.keys())
+ for k in keyz:
+ bld.subst_table['bin/default/' + k] = bld.subst_table[k]
+
+ tp = tuple(bld.subst_table.keys())
+ bld.subst_table_h = hash(tp)
return bld.subst_table_h
@TaskGen.feature('pubh')