From e6f7a13a17b30d2a266924d8099c77ea47f4d500 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Mar 2010 10:58:07 +1100
Subject: build: try faster includes processing

---
 buildtools/wafsamba/samba_deps.py  | 24 ++++++++++++++++++++----
 buildtools/wafsamba/samba_utils.py |  1 -
 buildtools/wafsamba/wafsamba.py    |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index cc013eed6b..24807f844e 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -146,9 +146,9 @@ def build_includes(self):
     if getattr(self, 'local_include', True) == True and not getattr(self, 'local_include_first', True):
         includes.append('.')
 
-    self.includes = unique_list(includes)
-    debug('deps: includes for target %s: includes=%s',
-          self.sname, self.includes)
+    self.env['INC_PATHS'] = unique_list(includes)
+    debug('deps: includes for target %s: INC_PATHS=%s',
+          self.sname, self.env['INC_PATHS'])
 
 
 
@@ -572,9 +572,10 @@ def calculate_final_deps(bld, tgt_list):
 
 ######################################################################
 # this provides a way to save our dependency calculations between runs
-savedeps_version = 1
+savedeps_version = 2
 savedeps_inputs  = ['samba_deps', 'samba_includes', 'local_include', 'local_include_first', 'samba_cflags']
 savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes', 'ccflags']
+savedeps_outenv  = ['INC_PATHS']
 savedeps_caches  = ['GLOBAL_DEPENDENCIES', 'TARGET_ALIAS', 'TARGET_TYPE', 'INIT_FUNCTIONS']
 
 def save_samba_deps(bld, tgt_list):
@@ -587,6 +588,7 @@ def save_samba_deps(bld, tgt_list):
     denv.savedeps_outputs = savedeps_outputs
     denv.input = {}
     denv.output = {}
+    denv.outenv = {}
     denv.caches = {}
 
     for c in savedeps_caches:
@@ -611,6 +613,13 @@ def save_samba_deps(bld, tgt_list):
         if tdeps != {}:
             denv.output[t.sname] = tdeps
 
+        tdeps = {}
+        for attr in savedeps_outenv:
+            if attr in t.env:
+                tdeps[attr] = t.env[attr]
+        if tdeps != {}:
+            denv.outenv[t.sname] = tdeps
+
     depsfile = os.path.join(bld.bdir, "sambadeps")
     denv.store(depsfile)
 
@@ -656,6 +665,13 @@ def load_samba_deps(bld, tgt_list):
         for a in tdeps:
             setattr(t, a, tdeps[a])
 
+    # put output env vars in place
+    for t in tgt_list:
+        if not t.sname in denv.outenv: continue
+        tdeps = denv.outenv[t.sname]
+        for a in tdeps:
+            t.env[a] = tdeps[a]
+
     debug('deps: loaded saved dependencies')
     return True
 
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index d01edcf3b4..5fbb801ef6 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -301,4 +301,3 @@ def mkdir_p(dir):
         return
     mkdir_p(os.path.dirname(dir))
     os.mkdir(dir)
-
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index db4b7b80d2..302e0676b1 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -447,3 +447,4 @@ def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None):
         t.env.LINK_TARGET = target
 
 Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT
+
-- 
cgit