From d2ba81f69cec3abc5ccc9c0a5a77b2f6a7ded9a8 Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Wed, 4 May 2011 11:20:20 -0700 Subject: [PATCH] Make modules no longer be enabled from waf build --- wscript | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/wscript b/wscript index 1b0755f00..46c1593c6 100644 --- a/wscript +++ b/wscript @@ -567,6 +567,12 @@ def add_scratch_programs(bld): def build(bld): + # If --enabled-modules option was given, then print a warning + # message and exit this function. + if Options.options.enable_modules: + Logs.warn("No modules were built. Use waf configure --enable-modules to enable modules.") + return + bld.env['NS3_MODULES_WITH_TEST_LIBRARIES'] = [] bld.env['NS3_ENABLED_MODULE_TEST_LIBRARIES'] = [] bld.env['NS3_SCRIPT_DEPENDENCIES'] = [] @@ -633,16 +639,6 @@ def build(bld): add_examples_programs(bld) add_scratch_programs(bld) - ## if --enabled-modules option was given, we disable building the - ## modules that were not enabled, and programs that depend on - ## disabled modules. - - if Options.options.enable_modules: - Logs.warn("the option --enable-modules is being applied to this build only;" - " to make it permanent it needs to be given to waf configure.") - env['NS3_ENABLED_MODULES'] = ['ns3-'+mod for mod in - Options.options.enable_modules.split(',')] - if env['NS3_ENABLED_MODULES']: modules = env['NS3_ENABLED_MODULES']