Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1129)

Side by Side Diff: src/wscript

Issue 1872049: ns-3-openflow
Patch Set: Fixed two merge errors, and namespace ofi is now in ns3 Created 13 years, 1 month ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/devices/switch/wscript ('k') | wscript » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- 1 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
2 2
3 import os, os.path 3 import os, os.path
4 import shutil 4 import shutil
5 import types 5 import types
6 import warnings 6 import warnings
7 7
8 import TaskGen 8 import TaskGen
9 import Task 9 import Task
10 import Options 10 import Options
(...skipping 11 matching lines...) Expand all
22 'common', 22 'common',
23 'simulator', 23 'simulator',
24 'contrib', 24 'contrib',
25 'node', 25 'node',
26 'internet-stack', 26 'internet-stack',
27 'propagation', 27 'propagation',
28 'devices/point-to-point', 28 'devices/point-to-point',
29 'devices/csma', 29 'devices/csma',
30 'devices/emu', 30 'devices/emu',
31 'devices/bridge', 31 'devices/bridge',
32 'devices/switch',
32 'devices/tap-bridge', 33 'devices/tap-bridge',
33 'devices/virtual-net-device', 34 'devices/virtual-net-device',
34 'applications/onoff', 35 'applications/onoff',
35 'applications/packet-sink', 36 'applications/packet-sink',
36 'applications/udp-echo', 37 'applications/udp-echo',
37 'applications/bulk-send', 38 'applications/bulk-send',
38 'routing/nix-vector-routing', 39 'routing/nix-vector-routing',
39 'routing/olsr', 40 'routing/olsr',
40 'routing/global-routing', 41 'routing/global-routing',
41 'routing/static-routing', 42 'routing/static-routing',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 86
86 def configure(conf): 87 def configure(conf):
87 conf.sub_config('core') 88 conf.sub_config('core')
88 conf.sub_config('simulator') 89 conf.sub_config('simulator')
89 conf.sub_config('devices/emu') 90 conf.sub_config('devices/emu')
90 conf.sub_config('devices/tap-bridge') 91 conf.sub_config('devices/tap-bridge')
91 conf.sub_config('contrib') 92 conf.sub_config('contrib')
92 conf.sub_config('internet-stack') 93 conf.sub_config('internet-stack')
93 conf.sub_config('helper') 94 conf.sub_config('helper')
94 conf.sub_config('test') 95 conf.sub_config('test')
96 conf.sub_config('devices/switch')
95 97
96 blddir = os.path.abspath(os.path.join(conf.blddir, conf.env.variant())) 98 blddir = os.path.abspath(os.path.join(conf.blddir, conf.env.variant()))
97 conf.env.append_value('NS3_MODULE_PATH', blddir) 99 conf.env.append_value('NS3_MODULE_PATH', blddir)
98 if Options.options.enable_rpath: 100 if Options.options.enable_rpath:
99 conf.env.append_value('RPATH', '-Wl,-rpath=%s' % (os.path.join(blddir),) ) 101 conf.env.append_value('RPATH', '-Wl,-rpath=%s' % (os.path.join(blddir),) )
100 102
101 ## Used to link the 'test-runner' program with all of ns-3 code 103 ## Used to link the 'test-runner' program with all of ns-3 code
102 conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_ modules] 104 conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_ modules]
103 105
104 106
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 task.set_inputs(all_headers_inputs) 344 task.set_inputs(all_headers_inputs)
343 task.set_outputs(all_headers_outputs) 345 task.set_outputs(all_headers_outputs)
344 module_obj = self.bld.name_to_obj("ns3-" + self.module, self.env) 346 module_obj = self.bld.name_to_obj("ns3-" + self.module, self.env)
345 assert module_obj is not None, self.module 347 assert module_obj is not None, self.module
346 task.module_deps = module_obj.module_deps 348 task.module_deps = module_obj.module_deps
347 else: 349 else:
348 task.header_to_remove = all_headers_outputs[0] 350 task.header_to_remove = all_headers_outputs[0]
349 351
350 def install(self): 352 def install(self):
351 pass 353 pass
OLDNEW
« no previous file with comments | « src/devices/switch/wscript ('k') | wscript » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b