merge
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Mon, 18 Apr 2011 09:01:30 +0200
changeset 62a540fcc9a6f1
parent 61 611882e6b079
child 63 e89dca438df6
merge
example/wscript
helper/wscript
model/wscript
     1.1 --- a/example/wscript	Tue Feb 01 14:17:44 2011 +0100
     1.2 +++ b/example/wscript	Mon Apr 18 09:01:30 2011 +0200
     1.3 @@ -15,43 +15,43 @@
     1.4      obj.source = ['tcp-loopback.cc']
     1.5  
     1.6      obj = bld.create_ns3_program('dce-tcp-simple', 
     1.7 -                                 ['core', 'simulator', 'point-to-point', 
     1.8 -                                  'internet-stack', 'dce-manager'])
     1.9 +                                 ['core', 'point-to-point', 
    1.10 +                                  'internet', 'dce'])
    1.11      obj.source = 'dce-tcp-simple.cc'
    1.12  
    1.13      obj = bld.create_ns3_program('dce-udp-simple', 
    1.14 -                                 ['core', 'simulator', 'point-to-point', 
    1.15 -                                  'internet-stack', 'dce-manager'])
    1.16 +                                 ['core', 'point-to-point', 
    1.17 +                                  'internet', 'dce'])
    1.18      obj.source = 'dce-udp-simple.cc'
    1.19  
    1.20      obj = bld.create_ns3_program('dce-linux-simple', 
    1.21 -                                 ['core', 'simulator', 'point-to-point', 
    1.22 -                                  'internet-stack', 'dce-manager'])
    1.23 +                                 ['core', 'point-to-point', 
    1.24 +                                  'internet', 'dce'])
    1.25      obj.source = 'dce-linux-simple.cc'
    1.26  
    1.27      obj = bld.create_ns3_program('dce-iperf', 
    1.28 -                                 ['core', 'simulator', 'point-to-point', 
    1.29 -                                  'internet-stack', 'dce-manager'])
    1.30 +                                 ['core', 'point-to-point', 
    1.31 +                                  'internet', 'dce'])
    1.32      obj.source = 'dce-iperf.cc'
    1.33  
    1.34      obj = bld.create_ns3_program('dce-udp-perf', 
    1.35 -                                 ['core', 'simulator', 'point-to-point', 
    1.36 -                                  'internet-stack', 'dce-manager'])
    1.37 +                                 ['core', 'point-to-point', 
    1.38 +                                  'internet', 'dce'])
    1.39      obj.source = 'dce-udp-perf.cc'
    1.40  
    1.41      obj = bld.create_ns3_program('dce-linear', 
    1.42 -                                 ['core', 'simulator', 'point-to-point', 
    1.43 -                                  'internet-stack', 'dce-manager'])
    1.44 +                                 ['core', 'point-to-point', 
    1.45 +                                  'internet', 'dce'])
    1.46      obj.source = 'dce-linear.cc'
    1.47  
    1.48      obj = bld.create_ns3_program('dce-netlink', 
    1.49 -                                 ['core', 'simulator', 'point-to-point', 
    1.50 -                                  'internet-stack', 'dce-manager'])
    1.51 +                                 ['core', 'point-to-point', 
    1.52 +                                  'internet', 'dce'])
    1.53      obj.source = 'dce-netlink.cc'
    1.54  
    1.55      obj = bld.create_ns3_program('dce-linux', 
    1.56 -                                 ['core', 'simulator', 'point-to-point', 
    1.57 -                                  'internet-stack', 'dce-manager'])
    1.58 +                                 ['core', 'point-to-point', 
    1.59 +                                  'internet', 'dce'])
    1.60      obj.source = 'dce-linux.cc'
    1.61  
    1.62      obj = bld.create_dce_program('udp-perf')
     2.1 --- a/helper/wscript	Tue Feb 01 14:17:44 2011 +0100
     2.2 +++ b/helper/wscript	Mon Apr 18 09:01:30 2011 +0200
     2.3 @@ -1,9 +1,9 @@
     2.4  ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
     2.5  
     2.6  def build(bld):
     2.7 -    helper = bld.create_ns3_module('dce-helper', ['internet-stack', 'wifi', 'point-to-point', 'csma', 'olsr', 
     2.8 -                                                  'global-routing', 'onoff', 'packet-sink', 'udp-echo',
     2.9 -                                                  'dce', 'spectrum', 'helper'])
    2.10 +    helper = bld.create_ns3_module('dce-helper', ['internet', 'wifi', 'point-to-point', 'csma', 'olsr', 
    2.11 +                                                  'applications',
    2.12 +                                                  'dce', 'spectrum'])
    2.13      helper.source = [
    2.14          'dce-manager-helper.cc',
    2.15          'dce-application-helper.cc',
     3.1 --- a/model/wscript	Tue Feb 01 14:17:44 2011 +0100
     3.2 +++ b/model/wscript	Mon Apr 18 09:01:30 2011 +0200
     3.3 @@ -46,7 +46,7 @@
     3.4  
     3.5  
     3.6  def build(bld):
     3.7 -    dce = bld.create_ns3_module('dce', ['core', 'common', 'simulator', 'node'])
     3.8 +    dce = bld.create_ns3_module('dce', ['core', 'network'])
     3.9      dce.source = [
    3.10          'dce-manager.cc',
    3.11  	'dce-application.cc',