equal
deleted
inserted
replaced
13 conf.report_optional_feature("TapBridge", "Tap Bridge", |
13 conf.report_optional_feature("TapBridge", "Tap Bridge", |
14 False, |
14 False, |
15 "needs threading support which is not available") |
15 "needs threading support which is not available") |
16 |
16 |
17 if conf.env['ENABLE_TAP']: |
17 if conf.env['ENABLE_TAP']: |
18 blddir = os.path.abspath(os.path.join(conf.blddir, conf.env.variant())) |
18 blddir = os.path.abspath(os.path.join(conf.bldnode.abspath(), conf.variant)) |
19 tapcreatordir = os.path.abspath(os.path.join(blddir, "src/tap-bridge")) |
19 tapcreatordir = os.path.abspath(os.path.join(blddir, "src/tap-bridge")) |
20 conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir) |
20 conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir) |
21 else: |
21 else: |
22 # Add this module to the list of modules that won't be built |
22 # Add this module to the list of modules that won't be built |
23 # if they are enabled. |
23 # if they are enabled. |
32 module.source = [ |
32 module.source = [ |
33 'model/tap-bridge.cc', |
33 'model/tap-bridge.cc', |
34 'model/tap-encode-decode.cc', |
34 'model/tap-encode-decode.cc', |
35 'helper/tap-bridge-helper.cc', |
35 'helper/tap-bridge-helper.cc', |
36 ] |
36 ] |
37 headers = bld.new_task_gen('ns3header') |
37 headers = bld.new_task_gen(features=['ns3header']) |
38 headers.module = 'tap-bridge' |
38 headers.module = 'tap-bridge' |
39 headers.source = [ |
39 headers.source = [ |
40 'model/tap-bridge.h', |
40 'model/tap-bridge.h', |
41 'helper/tap-bridge-helper.h', |
41 'helper/tap-bridge-helper.h', |
42 'doc/tap.h', |
42 'doc/tap.h', |