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

(-)a/src/wscript (-2 / +7 lines)
 Lines 11-16    Link Here 
11
import Build
11
import Build
12
import Utils
12
import Utils
13
13
14
try:
15
    set
16
except NameError:
17
    from sets import Set as set # Python 2.3 fallback
18
14
all_modules = (
19
all_modules = (
15
    'core',
20
    'core',
16
    'common',
21
    'common',
 Lines 140-146    Link Here 
140
        ns3_dir_node = self.bld.path.find_dir("ns3")
145
        ns3_dir_node = self.bld.path.find_dir("ns3")
141
        if self.sub_dir is not None:
146
        if self.sub_dir is not None:
142
            ns3_dir_node = ns3_dir_node.find_dir(self.sub_dir)
147
            ns3_dir_node = ns3_dir_node.find_dir(self.sub_dir)
143
        for filename in self.to_list(self.source):
148
        for filename in set(self.to_list(self.source)):
144
            src_node = self.path.find_resource(filename)
149
            src_node = self.path.find_resource(filename)
145
            if src_node is None:
150
            if src_node is None:
146
                raise Utils.WafError("source ns3 header file %s not found" % (filename,))
151
                raise Utils.WafError("source ns3 header file %s not found" % (filename,))
 Lines 238-244    Link Here 
238
                if ns3headers.module != self.module:
243
                if ns3headers.module != self.module:
239
                    continue
244
                    continue
240
                found_the_module = True
245
                found_the_module = True
241
                for source in ns3headers.to_list(ns3headers.source):
246
                for source in set(ns3headers.to_list(ns3headers.source)):
242
                    source = os.path.basename(source)
247
                    source = os.path.basename(source)
243
                    node = ns3_dir_node.find_or_declare(os.path.basename(source))
248
                    node = ns3_dir_node.find_or_declare(os.path.basename(source))
244
                    if node is None:
249
                    if node is None:

Return to bug 860