[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  bd8e3cf... Substitute the pidl files without using 'headermap.txt'
      from  6e7d39f... s3: Another non-gnumake fix

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bd8e3cf85586c9d2fadef40c861221073923c91c
Author: Thomas Nagy <tnagy2pow10 at gmail.com>
Date:   Sat May 22 14:35:50 2010 +0200

    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 at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/wafsamba.py |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 0893eac..1efa10d 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')


-- 
Samba Shared Repository