Mercurial Mercurial > mathieu > ns-3-dce / 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.
merge
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Mon, 18 Apr 2011 09:01:30 +0200
changeset 62 a540fcc9a6f1
parent 61 611882e6b079
child 63 e89dca438df6
merge
example/wscript file | annotate | diff | comparison | revisions
helper/wscript file | annotate | diff | comparison | revisions
model/wscript file | annotate | diff | comparison | revisions 
--- a/example/wscript	Tue Feb 01 14:17:44 2011 +0100
+++ b/example/wscript	Mon Apr 18 09:01:30 2011 +0200
@@ -15,43 +15,43 @@
     obj.source = ['tcp-loopback.cc']
 
     obj = bld.create_ns3_program('dce-tcp-simple', 
-                                 ['core', 'simulator', 'point-to-point', 
-                                  'internet-stack', 'dce-manager'])
+                                 ['core', 'point-to-point', 
+                                  'internet', 'dce'])
     obj.source = 'dce-tcp-simple.cc'
 
     obj = bld.create_ns3_program('dce-udp-simple', 
-                                 ['core', 'simulator', 'point-to-point', 
-                                  'internet-stack', 'dce-manager'])
+                                 ['core', 'point-to-point', 
+                                  'internet', 'dce'])
     obj.source = 'dce-udp-simple.cc'
 
     obj = bld.create_ns3_program('dce-linux-simple', 
-                                 ['core', 'simulator', 'point-to-point', 
-                                  'internet-stack', 'dce-manager'])
+                                 ['core', 'point-to-point', 
+                                  'internet', 'dce'])
     obj.source = 'dce-linux-simple.cc'
 
     obj = bld.create_ns3_program('dce-iperf', 
-                                 ['core', 'simulator', 'point-to-point', 
-                                  'internet-stack', 'dce-manager'])
+                                 ['core', 'point-to-point', 
+                                  'internet', 'dce'])
     obj.source = 'dce-iperf.cc'
 
     obj = bld.create_ns3_program('dce-udp-perf', 
-                                 ['core', 'simulator', 'point-to-point', 
-                                  'internet-stack', 'dce-manager'])
+                                 ['core', 'point-to-point', 
+                                  'internet', 'dce'])
     obj.source = 'dce-udp-perf.cc'
 
     obj = bld.create_ns3_program('dce-linear', 
-                                 ['core', 'simulator', 'point-to-point', 
-                                  'internet-stack', 'dce-manager'])
+                                 ['core', 'point-to-point', 
+                                  'internet', 'dce'])
     obj.source = 'dce-linear.cc'
 
     obj = bld.create_ns3_program('dce-netlink', 
-                                 ['core', 'simulator', 'point-to-point', 
-                                  'internet-stack', 'dce-manager'])
+                                 ['core', 'point-to-point', 
+                                  'internet', 'dce'])
     obj.source = 'dce-netlink.cc'
 
     obj = bld.create_ns3_program('dce-linux', 
-                                 ['core', 'simulator', 'point-to-point', 
-                                  'internet-stack', 'dce-manager'])
+                                 ['core', 'point-to-point', 
+                                  'internet', 'dce'])
     obj.source = 'dce-linux.cc'
 
     obj = bld.create_dce_program('udp-perf')
--- a/helper/wscript	Tue Feb 01 14:17:44 2011 +0100
+++ b/helper/wscript	Mon Apr 18 09:01:30 2011 +0200
@@ -1,9 +1,9 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    helper = bld.create_ns3_module('dce-helper', ['internet-stack', 'wifi', 'point-to-point', 'csma', 'olsr', 
-                                                  'global-routing', 'onoff', 'packet-sink', 'udp-echo',
-                                                  'dce', 'spectrum', 'helper'])
+    helper = bld.create_ns3_module('dce-helper', ['internet', 'wifi', 'point-to-point', 'csma', 'olsr', 
+                                                  'applications',
+                                                  'dce', 'spectrum'])
     helper.source = [
         'dce-manager-helper.cc',
         'dce-application-helper.cc',
--- a/model/wscript	Tue Feb 01 14:17:44 2011 +0100
+++ b/model/wscript	Mon Apr 18 09:01:30 2011 +0200
@@ -46,7 +46,7 @@
 
 
 def build(bld):
-    dce = bld.create_ns3_module('dce', ['core', 'common', 'simulator', 'node'])
+    dce = bld.create_ns3_module('dce', ['core', 'network'])
     dce.source = [
         'dce-manager.cc',
 	'dce-application.cc',
mathieu/ns-3-dce