summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/wscript79
1 files changed, 0 insertions, 79 deletions
diff --git a/source4/wscript b/source4/wscript
index bac4e06aec..ae6a64f484 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -65,82 +65,3 @@ def configure(conf):
conf.SAMBA_CONFIG_H('include/config.h')
-
-from TaskGen import feature, before, after
-
-kak = {}
-@feature('cc', 'cxx')
-@after('apply_type_vars', 'apply_lib_vars', 'apply_core')
-def apply_incpaths(self):
- """used by the scanner
- after processing the uselib for CPPPATH
- after apply_core because some processing may add include paths
- """
- lst = []
- # TODO move the uselib processing out of here
- for lib in self.to_list(self.uselib):
- for path in self.env['CPPPATH_' + lib]:
- if not path in lst:
- lst.append(path)
- if preproc.go_absolute:
- for path in preproc.standard_includes:
- if not path in lst:
- lst.append(path)
-
- for path in self.to_list(self.includes):
- if not path in lst:
- if preproc.go_absolute or not os.path.isabs(path):
- lst.append(path)
- else:
- self.env.prepend_value('CPPPATH', path)
-
- for path in lst:
- try:
- #print len(kak.items())
- node = kak[(self.path.id, path)]
- except KeyError:
-
- node = None
- if os.path.isabs(path):
- if preproc.go_absolute:
- node = self.bld.root.find_dir(path)
- elif path[0] == '#':
- node = self.bld.srcnode
- if len(path) > 1:
- node = node.find_dir(path[1:])
- else:
- node = self.path.find_dir(path)
-
- kak[(self.path.id, path)] = node
- if node:
- self.env.append_value('INC_PATHS', node)
- # TODO WAF 1.6
- if USE_TOP_LEVEL:
- self.env.append_value('INC_PATHS', self.bld.srcnode)
-
-
-
-cac = {}
-@feature('cc')
-@after('apply_incpaths')
-def apply_obj_vars_cc(self):
- """after apply_incpaths for INC_PATHS"""
- env = self.env
- app = env.append_unique
- cpppath_st = env['CPPPATH_ST']
-
- global cac
-
- # local flags come first
- # set the user-defined includes paths
- for i in env['INC_PATHS']:
-
- try:
- app('_CCINCFLAGS', cac[i.id])
- except KeyError:
- cac[i.id] = [cpppath_st % i.bldpath(env), cpppath_st % i.srcpath(env)]
- app('_CCINCFLAGS', cac[i.id])
-
- # set the library include paths
- for i in env['CPPPATH']:
- app('_CCINCFLAGS', cpppath_st % i)