From d7731afca32d9ba07cff7102314c6702718c0c42 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Sat, 28 Jun 2014 08:31:24 +0200 Subject: [PATCH] Bug 1941 - [partial] Remove unnecessary dependency on Application module in other modules --- examples/ipv6/wscript | 14 +++++++------- examples/naming/wscript | 2 +- examples/realtime/wscript | 2 +- examples/routing/wscript | 14 +++++++------- examples/socket/wscript | 2 +- examples/tutorial/wscript | 2 +- examples/udp-client-server/wscript | 2 +- examples/udp/wscript | 2 +- src/bridge/examples/wscript | 6 +++--- src/csma/examples/wscript | 10 +++++----- src/csma/wscript | 2 +- src/sixlowpan/examples/wscript | 2 +- src/spectrum/examples/wscript | 6 +++--- src/spectrum/wscript | 2 +- src/tap-bridge/examples/wscript | 2 +- 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/examples/ipv6/wscript b/examples/ipv6/wscript index 681afeafa..1bb8a08bf 100644 --- a/examples/ipv6/wscript +++ b/examples/ipv6/wscript @@ -1,13 +1,13 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('icmpv6-redirect', ['csma', 'internet']) + obj = bld.create_ns3_program('icmpv6-redirect', ['csma', 'internet', 'applications']) obj.source = 'icmpv6-redirect.cc' - obj = bld.create_ns3_program('ping6', ['csma', 'internet']) + obj = bld.create_ns3_program('ping6', ['csma', 'internet', 'applications']) obj.source = 'ping6.cc' - obj = bld.create_ns3_program('radvd', ['csma', 'internet']) + obj = bld.create_ns3_program('radvd', ['csma', 'internet', 'applications']) obj.source = 'radvd.cc' obj = bld.create_ns3_program('radvd-two-prefix', ['csma', 'internet', 'applications']) @@ -16,15 +16,15 @@ def build(bld): obj = bld.create_ns3_program('test-ipv6', ['point-to-point', 'internet']) obj.source = 'test-ipv6.cc' - obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet']) + obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet', 'applications']) obj.source = 'fragmentation-ipv6.cc' - obj = bld.create_ns3_program('fragmentation-ipv6-two-MTU', ['csma', 'internet']) + obj = bld.create_ns3_program('fragmentation-ipv6-two-MTU', ['csma', 'internet', 'applications']) obj.source = 'fragmentation-ipv6-two-MTU.cc' - obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet']) + obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet', 'applications']) obj.source = 'loose-routing-ipv6.cc' - obj = bld.create_ns3_program('wsn-ping6', ['lr-wpan', 'internet', 'sixlowpan', 'mobility']) + obj = bld.create_ns3_program('wsn-ping6', ['lr-wpan', 'internet', 'sixlowpan', 'mobility', 'applications']) obj.source = 'wsn-ping6.cc' diff --git a/examples/naming/wscript b/examples/naming/wscript index 40f88df23..7c2a2bf27 100644 --- a/examples/naming/wscript +++ b/examples/naming/wscript @@ -1,5 +1,5 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('object-names', ['core', 'csma', 'internet']) + obj = bld.create_ns3_program('object-names', ['core', 'csma', 'internet', 'applications']) obj.source = 'object-names.cc' diff --git a/examples/realtime/wscript b/examples/realtime/wscript index 95e38398a..0ee41bfc9 100644 --- a/examples/realtime/wscript +++ b/examples/realtime/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('realtime-udp-echo', ['csma', 'internet']) + obj = bld.create_ns3_program('realtime-udp-echo', ['csma', 'internet', 'applications']) obj.source = 'realtime-udp-echo.cc' bld.register_ns3_script('realtime-udp-echo.py', ['csma', 'internet', 'applications']) diff --git a/examples/routing/wscript b/examples/routing/wscript index 8fba0e9c7..62ff52192 100644 --- a/examples/routing/wscript +++ b/examples/routing/wscript @@ -2,19 +2,19 @@ def build(bld): obj = bld.create_ns3_program('dynamic-global-routing', - ['point-to-point', 'csma', 'internet']) + ['point-to-point', 'csma', 'internet', 'applications']) obj.source = 'dynamic-global-routing.cc' obj = bld.create_ns3_program('static-routing-slash32', - ['point-to-point', 'csma', 'internet']) + ['point-to-point', 'csma', 'internet', 'applications']) obj.source = 'static-routing-slash32.cc' obj = bld.create_ns3_program('global-routing-slash32', - ['point-to-point', 'csma', 'internet']) + ['point-to-point', 'csma', 'internet', 'applications']) obj.source = 'global-routing-slash32.cc' obj = bld.create_ns3_program('global-injection-slash32', - ['point-to-point', 'csma', 'internet']) + ['point-to-point', 'csma', 'internet', 'applications']) obj.source = 'global-injection-slash32.cc' obj = bld.create_ns3_program('simple-global-routing', @@ -25,12 +25,12 @@ def build(bld): ['point-to-point', 'internet', 'applications']) obj.source = 'simple-alternate-routing.cc' - obj = bld.create_ns3_program( 'mixed-global-routing', - ['point-to-point', 'internet', 'csma']) + obj = bld.create_ns3_program('mixed-global-routing', + ['point-to-point', 'internet', 'csma', 'applications']) obj.source = 'mixed-global-routing.cc' obj = bld.create_ns3_program('simple-routing-ping6', - ['csma', 'internet']) + ['csma', 'internet', 'applications']) obj.source = 'simple-routing-ping6.cc' obj = bld.create_ns3_program('manet-routing-compare', diff --git a/examples/socket/wscript b/examples/socket/wscript index c47243855..bfbea1fd0 100644 --- a/examples/socket/wscript +++ b/examples/socket/wscript @@ -4,7 +4,7 @@ def build(bld): obj = bld.create_ns3_program('socket-bound-static-routing', ['network', 'csma', 'point-to-point', 'internet']) obj.source = 'socket-bound-static-routing.cc' - obj = bld.create_ns3_program('socket-bound-tcp-static-routing', ['network', 'csma', 'point-to-point', 'internet']) + obj = bld.create_ns3_program('socket-bound-tcp-static-routing', ['network', 'csma', 'point-to-point', 'internet', 'applications']) obj.source = 'socket-bound-tcp-static-routing.cc' obj = bld.create_ns3_program('socket-options-ipv4', ['network', 'csma', 'point-to-point', 'internet']) diff --git a/examples/tutorial/wscript b/examples/tutorial/wscript index 63ee409b3..bf0f5b209 100644 --- a/examples/tutorial/wscript +++ b/examples/tutorial/wscript @@ -12,7 +12,7 @@ def build(bld): obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet', 'applications']) obj.source = 'second.cc' - obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet']) + obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet', 'applications']) obj.source = 'third.cc' obj = bld.create_ns3_program('fourth', ['core']) diff --git a/examples/udp-client-server/wscript b/examples/udp-client-server/wscript index e2bef8528..d6d0b4998 100644 --- a/examples/udp-client-server/wscript +++ b/examples/udp-client-server/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('udp-client-server', ['csma', 'internet']) + obj = bld.create_ns3_program('udp-client-server', ['csma', 'internet', 'applications']) obj.source = 'udp-client-server.cc' obj = bld.create_ns3_program('udp-trace-client-server', ['csma', 'internet', 'applications']) diff --git a/examples/udp/wscript b/examples/udp/wscript index 6cb234a83..acce45fc5 100644 --- a/examples/udp/wscript +++ b/examples/udp/wscript @@ -1,5 +1,5 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('udp-echo', ['csma', 'internet']) + obj = bld.create_ns3_program('udp-echo', ['csma', 'internet', 'applications']) obj.source = 'udp-echo.cc' diff --git a/src/bridge/examples/wscript b/src/bridge/examples/wscript index e4e21106e..cdf18b1c9 100644 --- a/src/bridge/examples/wscript +++ b/src/bridge/examples/wscript @@ -2,11 +2,11 @@ def build(bld): - obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet']) + obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet', 'applications']) obj.source = 'csma-bridge.cc' - bld.register_ns3_script('csma-bridge.py', ['bridge', 'csma', 'internet']) + bld.register_ns3_script('csma-bridge.py', ['bridge', 'csma', 'internet', 'applications']) - obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet']) + obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet', 'applications']) obj.source = 'csma-bridge-one-hop.cc' diff --git a/src/csma/examples/wscript b/src/csma/examples/wscript index d9dab7c01..ef7f79e2c 100644 --- a/src/csma/examples/wscript +++ b/src/csma/examples/wscript @@ -1,19 +1,19 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('csma-one-subnet', ['csma', 'internet']) + obj = bld.create_ns3_program('csma-one-subnet', ['csma', 'internet', 'applications']) obj.source = 'csma-one-subnet.cc' - obj = bld.create_ns3_program('csma-broadcast', ['csma', 'internet']) + obj = bld.create_ns3_program('csma-broadcast', ['csma', 'internet', 'applications']) obj.source = 'csma-broadcast.cc' - obj = bld.create_ns3_program('csma-packet-socket', ['csma', 'internet']) + obj = bld.create_ns3_program('csma-packet-socket', ['csma', 'internet', 'applications']) obj.source = 'csma-packet-socket.cc' - obj = bld.create_ns3_program('csma-multicast', ['csma', 'internet']) + obj = bld.create_ns3_program('csma-multicast', ['csma', 'internet', 'applications']) obj.source = 'csma-multicast.cc' - obj = bld.create_ns3_program('csma-raw-ip-socket', ['csma', 'internet']) + obj = bld.create_ns3_program('csma-raw-ip-socket', ['csma', 'internet', 'applications']) obj.source = 'csma-raw-ip-socket.cc' obj = bld.create_ns3_program('csma-ping', ['csma', 'internet', 'applications']) diff --git a/src/csma/wscript b/src/csma/wscript index b365af31e..3a66126bd 100644 --- a/src/csma/wscript +++ b/src/csma/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('csma', ['network', 'applications']) + obj = bld.create_ns3_module('csma', ['network']) obj.source = [ 'model/backoff.cc', 'model/csma-net-device.cc', diff --git a/src/sixlowpan/examples/wscript b/src/sixlowpan/examples/wscript index 7ff6daf0c..e30632927 100644 --- a/src/sixlowpan/examples/wscript +++ b/src/sixlowpan/examples/wscript @@ -5,7 +5,7 @@ def build(bld): return; obj = bld.create_ns3_program('example-sixlowpan', - ['network', 'sixlowpan', 'internet', 'csma']) + ['network', 'sixlowpan', 'internet', 'csma', 'applications']) obj.source = 'example-sixlowpan.cc' obj = bld.create_ns3_program('example-ping-lr-wpan', diff --git a/src/spectrum/examples/wscript b/src/spectrum/examples/wscript index 27deedb91..cdf99855a 100644 --- a/src/spectrum/examples/wscript +++ b/src/spectrum/examples/wscript @@ -2,15 +2,15 @@ def build(bld): obj = bld.create_ns3_program('adhoc-aloha-ideal-phy', - ['spectrum', 'mobility']) + ['spectrum', 'mobility', 'internet', 'applications']) obj.source = 'adhoc-aloha-ideal-phy.cc' obj = bld.create_ns3_program('adhoc-aloha-ideal-phy-matrix-propagation-loss-model', - ['spectrum', 'mobility']) + ['spectrum', 'mobility', 'internet', 'applications']) obj.source = 'adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc' obj = bld.create_ns3_program('adhoc-aloha-ideal-phy-with-microwave-oven', - ['spectrum', 'mobility']) + ['spectrum', 'mobility', 'internet', 'applications']) obj.source = 'adhoc-aloha-ideal-phy-with-microwave-oven.cc' diff --git a/src/spectrum/wscript b/src/spectrum/wscript index b65e23e4b..be7b5e322 100644 --- a/src/spectrum/wscript +++ b/src/spectrum/wscript @@ -2,7 +2,7 @@ def build(bld): - module = bld.create_ns3_module('spectrum', ['internet', 'propagation', 'antenna', 'applications']) + module = bld.create_ns3_module('spectrum', ['propagation', 'antenna', 'applications']) module.source = [ 'model/spectrum-model.cc', 'model/spectrum-value.cc', diff --git a/src/tap-bridge/examples/wscript b/src/tap-bridge/examples/wscript index aeca10764..bf3865a66 100644 --- a/src/tap-bridge/examples/wscript +++ b/src/tap-bridge/examples/wscript @@ -11,5 +11,5 @@ def build(bld): obj = bld.create_ns3_program('tap-wifi-virtual-machine', ['csma', 'tap-bridge', 'internet', 'wifi', 'mobility']) obj.source = 'tap-wifi-virtual-machine.cc' bld.register_ns3_script('tap-wifi-virtual-machine.py', ['csma', 'tap-bridge', 'internet', 'wifi', 'mobility']) - obj = bld.create_ns3_program('tap-wifi-dumbbell', ['wifi', 'csma', 'point-to-point', 'tap-bridge', 'internet']) + obj = bld.create_ns3_program('tap-wifi-dumbbell', ['wifi', 'csma', 'point-to-point', 'tap-bridge', 'internet', 'applications']) obj.source = 'tap-wifi-dumbbell.cc'