View | Details | Raw Unified | Return to bug 860
Collapse All | Expand All

(-)a/src/wscript (+8 lines)
 Lines 140-146    Link Here 
140 
        ns3_dir_node = self.bld.path.find_dir("ns3")
 140 
        ns3_dir_node = self.bld.path.find_dir("ns3")
141 
        if self.sub_dir is not None:
 141 
        if self.sub_dir is not None:
142 
            ns3_dir_node = ns3_dir_node.find_dir(self.sub_dir)
 142 
            ns3_dir_node = ns3_dir_node.find_dir(self.sub_dir)
143 
        seen = {}
143 
        for filename in self.to_list(self.source):
 144 
        for filename in self.to_list(self.source):
145 
            if filename in seen:
146 
                continue
147 
            seen[filename] = 1
144 
            src_node = self.path.find_resource(filename)
 148 
            src_node = self.path.find_resource(filename)
145 
            if src_node is None:
 149 
            if src_node is None:
146 
                raise Utils.WafError("source ns3 header file %s not found" % (filename,))
 150 
                raise Utils.WafError("source ns3 header file %s not found" % (filename,))
 Lines 238-244    Link Here 
238 
                if ns3headers.module != self.module:
 242 
                if ns3headers.module != self.module:
239 
                    continue
 243 
                    continue
240 
                found_the_module = True
 244 
                found_the_module = True
245 
                seen = {}
241 
                for source in ns3headers.to_list(ns3headers.source):
 246 
                for source in ns3headers.to_list(ns3headers.source):
247 
                    if source in seen:
248 
                        continue
249 
                    seen[source] = 1
242 
                    source = os.path.basename(source)
 250 
                    source = os.path.basename(source)
243 
                    node = ns3_dir_node.find_or_declare(os.path.basename(source))
 251 
                    node = ns3_dir_node.find_or_declare(os.path.basename(source))
244 
                    if node is None:
 252 
                    if node is None:

Return to bug 860