general: Topology plugin is now compiled by default
Also, rescanned python bindings that include topology plugin
information, but exclude mobility plugin bindings
diff --git a/wscript b/wscript
index 974e39f..55a13bc 100644
--- a/wscript
+++ b/wscript
@@ -12,9 +12,13 @@
def options(opt):
opt.tool_options('boost', tooldir=["waf-tools"])
opt.add_option('--enable-ndn-plugins',
- help=("Enable NDN plugins (may require patching)"),
+ help=("Enable NDN plugins (may require patching). topology plugin enabled by default"),
dest='enable_ndn_plugins')
+ opt.add_option('--disable-ndn-plugins',
+ help=("Enable NDN plugins (may require patching). topology plugin enabled by default"),
+ dest='disable_ndn_plugins')
+
def configure(conf):
try:
conf.check_tool('boost')
@@ -29,9 +33,12 @@
conf.env['MODULES_NOT_BUILT'].append('ndnSIM')
return
- conf.env['NDN_plugins'] = []
+ conf.env['NDN_plugins'] = ['topology']
if Options.options.enable_ndn_plugins:
- conf.env['NDN_plugins'] = Options.options.enable_ndn_plugins.split(',')
+ conf.env['NDN_plugins'] = conf.env['NDN_plugins'] + Options.options.enable_ndn_plugins.split(',')
+
+ if Options.options.disable_ndn_plugins:
+ conf.env['NDN_plugins'] = conf.env['NDN_plugins'] - Options.options.disable_ndn_plugins.split(',')
conf.env['ENABLE_NDN_ABSTRACT']=True;