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>

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 0893eacffd1deb351d0f57896f8136cd96360921..1efa10d4f0b7b9b365b329b04605a830becf666b 100644 (file)
--- 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')