Bug 1941 - [partial] Remove unnecessary dependency on Application module in other modules
--- a/examples/ipv6/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/examples/ipv6/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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 @@
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'
--- a/examples/naming/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/examples/naming/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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'
--- a/examples/realtime/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/examples/realtime/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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'])
--- a/examples/routing/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/examples/routing/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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 @@
['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',
--- a/examples/socket/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/examples/socket/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -4,7 +4,7 @@
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'])
--- a/examples/tutorial/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/examples/tutorial/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -12,7 +12,7 @@
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'])
--- a/examples/udp-client-server/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/examples/udp-client-server/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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'])
--- a/examples/udp/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/examples/udp/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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'
--- a/src/bridge/examples/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/src/bridge/examples/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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'
--- a/src/csma/examples/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/src/csma/examples/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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'])
--- a/src/csma/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/src/csma/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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',
--- a/src/sixlowpan/examples/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/src/sixlowpan/examples/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -5,7 +5,7 @@
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',
--- a/src/spectrum/examples/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/src/spectrum/examples/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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'
--- a/src/spectrum/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/src/spectrum/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -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',
--- a/src/tap-bridge/examples/wscript Fri Jun 27 22:28:07 2014 +0200
+++ b/src/tap-bridge/examples/wscript Sat Jun 28 08:31:24 2014 +0200
@@ -11,5 +11,5 @@
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'