From 5cefb05ecaa1d81d7fe9e4e597d5277400253adb Mon Sep 17 00:00:00 2001 From: "Peter D. Barnes, Jr." Date: Thu, 4 Aug 2016 12:44:41 -0700 Subject: [PATCH] wscript: replace tab indenting with spaces --- src/antenna/wscript | 10 +++++----- src/flow-monitor/wscript | 2 +- src/lte/wscript | 2 +- src/nix-vector-routing/wscript | 4 ++-- src/openflow/wscript | 10 +++++----- src/wimax/wscript | 12 +++++++----- wscript | 10 +++++----- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/antenna/wscript b/src/antenna/wscript index 3f76ce862..b18b94c37 100644 --- a/src/antenna/wscript +++ b/src/antenna/wscript @@ -7,11 +7,11 @@ def build(bld): module.source = [ 'model/angles.cc', 'model/antenna-model.cc', - 'model/isotropic-antenna-model.cc', + 'model/isotropic-antenna-model.cc', 'model/cosine-antenna-model.cc', 'model/parabolic-antenna-model.cc', - ] - + ] + module_test = bld.create_ns3_module_test_library('antenna') module_test.source = [ 'test/test-angles.cc', @@ -26,9 +26,9 @@ def build(bld): headers.source = [ 'model/angles.h', 'model/antenna-model.h', - 'model/isotropic-antenna-model.h', + 'model/isotropic-antenna-model.h', 'model/cosine-antenna-model.h', 'model/parabolic-antenna-model.h', - ] + ] bld.ns3_python_bindings() diff --git a/src/flow-monitor/wscript b/src/flow-monitor/wscript index 6c191100b..9d55766f0 100644 --- a/src/flow-monitor/wscript +++ b/src/flow-monitor/wscript @@ -10,7 +10,7 @@ def build(bld): 'ipv4-flow-probe.cc', 'ipv6-flow-classifier.cc', 'ipv6-flow-probe.cc', - 'histogram.cc', + 'histogram.cc', ]] obj.source.append("helper/flow-monitor-helper.cc") diff --git a/src/lte/wscript b/src/lte/wscript index cf4357ffd..f040c3fd0 100644 --- a/src/lte/wscript +++ b/src/lte/wscript @@ -295,7 +295,7 @@ def build(bld): 'model/lte-ffr-soft-algorithm.h', 'model/lte-ffr-enhanced-algorithm.h', 'model/lte-ffr-distributed-algorithm.h', - 'model/lte-ue-power-control.h', + 'model/lte-ue-power-control.h', ] if (bld.env['ENABLE_EMU']): diff --git a/src/nix-vector-routing/wscript b/src/nix-vector-routing/wscript index 6fa417c5c..acfd74f09 100644 --- a/src/nix-vector-routing/wscript +++ b/src/nix-vector-routing/wscript @@ -5,14 +5,14 @@ def build(bld): module.includes = '.' module.source = [ 'model/ipv4-nix-vector-routing.cc', - 'helper/ipv4-nix-vector-helper.cc', + 'helper/ipv4-nix-vector-helper.cc', ] headers = bld(features='ns3header') headers.module = 'nix-vector-routing' headers.source = [ 'model/ipv4-nix-vector-routing.h', - 'helper/ipv4-nix-vector-helper.h', + 'helper/ipv4-nix-vector-helper.h', ] if bld.env['ENABLE_EXAMPLES']: diff --git a/src/openflow/wscript b/src/openflow/wscript index 9c5ccdcd5..add7a22d2 100644 --- a/src/openflow/wscript +++ b/src/openflow/wscript @@ -6,8 +6,8 @@ from waflib.Errors import WafError def options(opt): opt.add_option('--with-openflow', - help=('Path to OFSID source for NS-3 OpenFlow Integration support'), - default='', dest='with_openflow') + help=('Path to OFSID source for NS-3 OpenFlow Integration support'), + default='', dest='with_openflow') REQUIRED_BOOST_LIBS = ['system', 'signals', 'filesystem'] @@ -17,7 +17,7 @@ def required_boost_libs(conf): def configure(conf): if not conf.env['LIB_BOOST']: conf.report_optional_feature("openflow", "NS-3 OpenFlow Integration", False, - "Required boost libraries not found") + "Required boost libraries not found") # Add this module to the list of modules that won't be built # if they are enabled. @@ -35,7 +35,7 @@ def configure(conf): missing_boost_libs = [lib for lib in REQUIRED_BOOST_LIBS if lib not in present_boost_libs] if missing_boost_libs != []: conf.report_optional_feature("openflow", "NS-3 OpenFlow Integration", False, - "Required boost libraries not found, missing: %s" % ', '.join(missing_boost_libs)) + "Required boost libraries not found, missing: %s" % ', '.join(missing_boost_libs)) # Add this module to the list of modules that won't be built # if they are enabled. @@ -64,7 +64,7 @@ def configure(conf): if not conf.env['WITH_OPENFLOW']: conf.msg("Checking for OpenFlow location", False) conf.report_optional_feature("openflow", "NS-3 OpenFlow Integration", False, - "OpenFlow not enabled (see option --with-openflow)") + "OpenFlow not enabled (see option --with-openflow)") # Add this module to the list of modules that won't be built # if they are enabled. conf.env['MODULES_NOT_BUILT'].append('openflow') diff --git a/src/wimax/wscript b/src/wimax/wscript index d11ec8695..975f619f7 100644 --- a/src/wimax/wscript +++ b/src/wimax/wscript @@ -38,7 +38,7 @@ def build(bld): 'model/bs-link-manager.cc', 'model/bandwidth-manager.cc', 'model/crc8.cc', - 'model/ul-job.cc' , + 'model/ul-job.cc', 'model/snr-to-block-error-rate-record.cc', 'model/snr-to-block-error-rate-manager.cc', 'model/simple-ofdm-send-param.cc', @@ -50,7 +50,8 @@ def build(bld): 'model/cs-parameters.cc', 'model/wimax-mac-to-mac-header.cc', 'helper/wimax-helper.cc', - ] + ] + obj_test = bld.create_ns3_module_test_library('wimax') obj_test.source = [ @@ -61,8 +62,8 @@ def build(bld): 'test/phy-test.cc', 'test/qos-test.cc', 'test/wimax-fragmentation-test.cc', - ] - + ] + headers = bld(features='ns3header') headers.module = 'wimax' headers.source = [ @@ -110,7 +111,8 @@ def build(bld): 'model/bvec.h', 'model/wimax-mac-to-mac-header.h', 'helper/wimax-helper.h', - ] + ] + if bld.env['ENABLE_EXAMPLES']: bld.recurse('examples') diff --git a/wscript b/wscript index 5f35f2a3c..05bdc5f2c 100644 --- a/wscript +++ b/wscript @@ -55,11 +55,11 @@ finally: sys.path.pop(0) cflags.profiles = { - # profile name: [optimization_level, warnings_level, debug_level] - 'debug': [0, 2, 3], - 'optimized': [3, 2, 1], - 'release': [3, 2, 0], - } + # profile name: [optimization_level, warnings_level, debug_level] + 'debug': [0, 2, 3], + 'optimized': [3, 2, 1], + 'release': [3, 2, 0], + } cflags.default_profile = 'debug' Configure.autoconfig = 0