Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix dependencies in various wscripts
authorMitch Watrous <watrous@u.washington.edu>
Mon, 07 Mar 2011 16:59:09 -0800
changeset 6873 b2234c2d38d9
parent 6872 49ea820203d4
child 6875 106abe4a32f0
Fix dependencies in various wscripts
examples/error-model/wscript file | annotate | diff | comparison | revisions
examples/mpi/wscript file | annotate | diff | comparison | revisions
examples/routing/wscript file | annotate | diff | comparison | revisions
examples/tcp/wscript file | annotate | diff | comparison | revisions
examples/tutorial/wscript file | annotate | diff | comparison | revisions
examples/wireless/wscript file | annotate | diff | comparison | revisions
src/csma/wscript file | annotate | diff | comparison | revisions
src/dsdv/wscript file | annotate | diff | comparison | revisions
src/mesh/model/dot11s/wscript file | annotate | diff | comparison | revisions
src/mesh/wscript file | annotate | diff | comparison | revisions
src/netanim/examples/wscript file | annotate | diff | comparison | revisions
src/olsr/wscript file | annotate | diff | comparison | revisions
src/virtual-net-device/examples/wscript file | annotate | diff | comparison | revisions 
--- a/examples/error-model/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/examples/error-model/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -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('simple-error-model', ['point-to-point', 'internet'])
+    obj = bld.create_ns3_program('simple-error-model', ['point-to-point', 'internet', 'applications'])
     obj.source = 'simple-error-model.cc'
--- a/examples/mpi/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/examples/mpi/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -6,9 +6,9 @@
     obj.source = 'simple-distributed.cc'
 
     obj = bld.create_ns3_program('third-distributed',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'internet', 'mobility', 'wifi'])
     obj.source = 'third-distributed.cc'
 
     obj = bld.create_ns3_program('nms-p2p-nix-distributed',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'network', 'applications'])
     obj.source = 'nms-p2p-nix-distributed.cc'
--- a/examples/routing/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/examples/routing/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -6,23 +6,23 @@
     obj.source = 'dynamic-global-routing.cc'
 
     obj = bld.create_ns3_program('static-routing-slash32',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'csma', 'internet'])
     obj.source = 'static-routing-slash32.cc'
 
     obj = bld.create_ns3_program('global-routing-slash32',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'csma', 'internet'])
     obj.source = 'global-routing-slash32.cc'
 
     obj = bld.create_ns3_program('global-injection-slash32',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'csma', 'internet'])
     obj.source = 'global-injection-slash32.cc'
 
     obj = bld.create_ns3_program('simple-global-routing',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'internet', 'applications', 'flow-monitor'])
     obj.source = 'simple-global-routing.cc'
 
     obj = bld.create_ns3_program('simple-alternate-routing',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'internet', 'applications'])
     obj.source = 'simple-alternate-routing.cc'
 
     obj = bld.create_ns3_program( 'mixed-global-routing',
--- a/examples/tcp/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/examples/tcp/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -2,11 +2,11 @@
 
 def build(bld):
     obj = bld.create_ns3_program('tcp-large-transfer',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'applications', 'internet'])
     obj.source = 'tcp-large-transfer.cc'
 
     obj = bld.create_ns3_program('tcp-nsc-lfn',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'applications', 'internet'])
     obj.source = 'tcp-nsc-lfn.cc'
 
     obj = bld.create_ns3_program('tcp-nsc-zoo',
@@ -14,13 +14,13 @@
     obj.source = 'tcp-nsc-zoo.cc'
 
     obj = bld.create_ns3_program('tcp-star-server',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'applications', 'internet'])
     obj.source = 'tcp-star-server.cc'
 
     obj = bld.create_ns3_program('star',
-                                 ['point-to-point', 'internet'])
+                                 ['netanim', 'point-to-point', 'internet'])
     obj.source = 'star.cc'
 
     obj = bld.create_ns3_program('tcp-bulk-send',
-                                 ['point-to-point', 'internet'])
+                                 ['point-to-point', 'applications', 'internet'])
     obj.source = 'tcp-bulk-send.cc'
--- a/examples/tutorial/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/examples/tutorial/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -4,7 +4,7 @@
     obj = bld.create_ns3_program('hello-simulator', ['core'])
     obj.source = 'hello-simulator.cc'
         
-    obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet'])
+    obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet', 'applications'])
     obj.source = 'first.cc'
         
     obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet'])
@@ -16,8 +16,8 @@
     obj = bld.create_ns3_program('fourth', ['core'])
     obj.source = 'fourth.cc'
 
-    obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet'])
+    obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet', 'applications'])
     obj.source = 'fifth.cc'
 
-    obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet'])
+    obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet', 'applications'])
     obj.source = 'sixth.cc'
--- a/examples/wireless/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/examples/wireless/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -2,7 +2,7 @@
 
 def build(bld):
     obj = bld.create_ns3_program('mixed-wireless', ['core', 'mobility', 'wifi', 'point-to-point', 
-                                                    'internet'])
+                                                    'internet', 'csma'])
     obj.source = 'mixed-wireless.cc'
 
     obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'contrib'])
@@ -11,31 +11,31 @@
     obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'wifi-clear-channel-cmu.cc'
 
-    obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi', 'applications', 'contrib'])
     obj.source = 'wifi-ap.cc'
 
     obj = bld.create_ns3_program('wifi-wired-bridging', ['core', 'mobility', 'wifi', 'csma', 'bridge'])
     obj.source = 'wifi-wired-bridging.cc'
 
-    obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
     obj.source = 'simple-wifi-frame-aggregation.cc'
 
-    obj = bld.create_ns3_program('multirate', ['core', 'mobility', 'wifi', 'contrib'])
+    obj = bld.create_ns3_program('multirate', ['core', 'mobility', 'wifi', 'contrib', 'flow-monitor'])
     obj.source = 'multirate.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-adhoc', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'mobility', 'wifi', 'contrib'])
     obj.source = 'wifi-simple-adhoc.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['core', 'mobility', 'wifi', 'olsr'])
     obj.source = 'wifi-simple-adhoc-grid.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-infra', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-simple-infra', ['internet', 'mobility', 'wifi'])
     obj.source = 'wifi-simple-infra.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-interference', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'mobility', 'wifi', 'contrib'])
     obj.source = 'wifi-simple-interference.cc'
 
-    obj = bld.create_ns3_program('wifi-blockack', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-blockack', ['internet', 'mobility', 'wifi', 'applications'])
     obj.source = 'wifi-blockack.cc'
 
     obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'contrib'])
--- a/src/csma/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/src/csma/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -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'])
+    obj = bld.create_ns3_module('csma', ['network', 'point-to-point', 'applications', 'netanim'])
     obj.source = [
         'model/backoff.cc',
         'model/csma-net-device.cc',
--- a/src/dsdv/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/src/dsdv/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('dsdv', ['internet'])
+    module = bld.create_ns3_module('dsdv', ['internet', 'wifi', 'mesh', 'applications'])
     module.includes = '.'
     module.source = [
         'model/dsdv-rtable.cc',
--- a/src/mesh/model/dot11s/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/src/mesh/model/dot11s/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -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('dot11s', ['wifi', 'mesh'])
+    obj = bld.create_ns3_module('dot11s', ['wifi'])
     obj.source = [
         'model/ie-dot11s-beacon-timing.cc',
         'model/ie-dot11s-configuration.cc',
--- a/src/mesh/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/src/mesh/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -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('mesh', ['wifi'])
+    obj = bld.create_ns3_module('mesh', ['wifi', 'dot11s'])
 
     obj.source = [
         'model/mesh-information-element-vector.cc',
--- a/src/netanim/examples/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/src/netanim/examples/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -2,13 +2,13 @@
 
 def build(bld):
     obj = bld.create_ns3_program('dumbbell-animation',
-                                 ['netanim'])
+                                 ['netanim', 'applications'])
     obj.source = 'dumbbell-animation.cc'
 
     obj = bld.create_ns3_program('grid-animation',
-                                 ['netanim'])
+                                 ['netanim', 'applications'])
     obj.source = 'grid-animation.cc'
 
     obj = bld.create_ns3_program('star-animation',
-                                 ['netanim'])
+                                 ['netanim', 'applications'])
     obj.source = 'star-animation.cc'
--- a/src/olsr/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/src/olsr/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('olsr', ['internet'])
+    module = bld.create_ns3_module('olsr', ['internet', 'contrib', 'point-to-point', 'wifi', 'mobility', 'applications', 'csma'])
     module.includes = '.'
     module.source = [
         'model/olsr-header.cc',
--- a/src/virtual-net-device/examples/wscript	Mon Mar 07 10:46:12 2011 -0800
+++ b/src/virtual-net-device/examples/wscript	Mon Mar 07 16:59:09 2011 -0800
@@ -2,6 +2,6 @@
 
 def build(bld):
 
-    obj = bld.create_ns3_program('virtual-net-device', ['point-to-point', 'internet'])
+    obj = bld.create_ns3_program('virtual-net-device', ['virtual-net-device', 'point-to-point', 'internet', 'applications'])
     obj.source = 'virtual-net-device.cc'
ns-3.24