Attachment #1151 for bug #1174

View | Details | Raw Unified | Return to bug 1174
Collapse All | Expand All

(-)ns3.orig/ns-3.11/src/aodv/wscript (-2 / +13 lines)

Lines 1-7	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('aodv', ['internet', 'wifi', 'applications', 'mesh', 'point-to-point', 'virtual-net-device'])

    job = 'aodv'

    dependencies = ['internet', 'wifi', 'applications', 'mesh', 'point-to-point', 'virtual-net-device']

    module = bld.create_ns3_module(job, dependencies)

    module.includes = '.'

    module.includes = '.'

    module.source = [

    module.source = [

        'model/aodv-id-cache.cc',

        'model/aodv-id-cache.cc',

Lines 13-19	Link Here

        'model/aodv-routing-protocol.cc',

        'model/aodv-routing-protocol.cc',

	'helper/aodv-helper.cc',

	'helper/aodv-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.includes = '.'

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    aodv_test = bld.create_ns3_module_test_library('aodv')

    aodv_test = bld.create_ns3_module_test_library('aodv')

    aodv_test.source = [

    aodv_test.source = [

        'test/aodv-id-cache-test-suite.cc',

        'test/aodv-id-cache-test-suite.cc',

(-)ns3.orig/ns-3.11/src/applications/wscript (-2 / +11 lines)

Lines 1-7	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('applications', ['internet', 'config-store', 'tools'])

    job = 'applications'

    dependencies = ['internet', 'config-store', 'tools']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

        'model/bulk-send-application.cc',

        'model/bulk-send-application.cc',

        'model/onoff-application.cc',

        'model/onoff-application.cc',

Lines 26-32	Link Here

        'helper/udp-echo-helper.cc',

        'helper/udp-echo-helper.cc',

        'helper/v4ping-helper.cc',

        'helper/v4ping-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    applications_test = bld.create_ns3_module_test_library('applications')

    applications_test = bld.create_ns3_module_test_library('applications')

    applications_test.source = [

    applications_test.source = [

        'test/udp-client-server-test.cc',

        'test/udp-client-server-test.cc',

(-)ns3.orig/ns-3.11/src/bridge/wscript (-2 / +12 lines)

Lines 1-12	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('bridge', ['network'])

    job = 'bridge'

    obj.source = [

    dependencies = ['network']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/bridge-net-device.cc',

        'model/bridge-net-device.cc',

        'model/bridge-channel.cc',

        'model/bridge-channel.cc',

        'helper/bridge-helper.cc',

        'helper/bridge-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'bridge'

    headers.module = 'bridge'

    headers.source = [

    headers.source = [

(-)ns3.orig/ns-3.11/src/click/wscript (-3 / +12 lines)

Lines 71-85	Link Here

        conf.env.append_value('CPPPATH', conf.env['CPPPATH_NSCLICK'])

        conf.env.append_value('CPPPATH', conf.env['CPPPATH_NSCLICK'])

def build(bld):

def build(bld):

    job = 'click'

    module = bld.create_ns3_module('click', ['internet'])

    dependencies = ['internet']

    module = bld.create_ns3_module(job, dependencies)

    module.includes = '. CPPPATH_NSCLICK'

    module.includes = '. CPPPATH_NSCLICK'

    module.source = [

    module.source = [

        'model/ipv4-click-routing.cc',

        'model/ipv4-click-routing.cc',

        'model/ipv4-l3-click-protocol.cc',

        'model/ipv4-l3-click-protocol.cc',

        'helper/click-internet-stack-helper.cc',

        'helper/click-internet-stack-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.includes = '. CPPPATH_NSCLICK'

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('click')

    module_test = bld.create_ns3_module_test_library('click')

    module_test.source = [

    module_test.source = [

        'test/ipv4-click-routing-test.cc',

        'test/ipv4-click-routing-test.cc',

(-)ns3.orig/ns-3.11/src/config-store/wscript (-3 / +13 lines)

Lines 18-24	Link Here

def build(bld):

def build(bld):

    module = bld.create_ns3_module('config-store', ['core', 'network'])

    job = 'config-store'

    dependencies = ['core', 'network']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

        'model/attribute-iterator.cc',

        'model/attribute-iterator.cc',

        'model/config-store.cc',

        'model/config-store.cc',

Lines 26-32	Link Here

        'model/file-config.cc',

        'model/file-config.cc',

        'model/raw-text-config.cc',

        'model/raw-text-config.cc',

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'config-store'

    headers.module = 'config-store'

    headers.source = [

    headers.source = [

Lines 49-53	Link Here

            module.uselib = module.uselib + ' LIBXML2'

            module.uselib = module.uselib + ' LIBXML2'

        else:

        else:

            module.uselib = 'LIBXML2'

            module.uselib = 'LIBXML2'

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    static_module.uselib         = module.uselib

    bld.ns3_python_bindings()

    bld.ns3_python_bindings()

(-)ns3.orig/ns-3.11/src/csma-layout/wscript (-2 / +12 lines)

Lines 1-10	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('csma-layout', ['csma', 'network', 'applications'])

    job = 'csma-layout'

    obj.source = [

    dependencies = ['csma', 'network', 'applications']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/csma-star-helper.cc',

        'model/csma-star-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'csma-layout'

    headers.module = 'csma-layout'

    headers.source = [

    headers.source = [

(-)ns3.orig/ns-3.11/src/csma/wscript (-2 / +12 lines)

Lines 1-13	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('csma', ['network', 'applications'])

    job = 'csma'

    obj.source = [

    dependencies = ['network', 'applications']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/backoff.cc',

        'model/backoff.cc',

        'model/csma-net-device.cc',

        'model/csma-net-device.cc',

        'model/csma-channel.cc',

        'model/csma-channel.cc',

        'helper/csma-helper.cc',

        'helper/csma-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'csma'

    headers.module = 'csma'

    headers.source = [

    headers.source = [

(-)ns3.orig/ns-3.11/src/dsdv/wscript (-2 / +12 lines)

Lines 1-7	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('dsdv', ['internet', 'wifi', 'mesh', 'applications'])

    job = 'dsdv'

    dependencies = ['internet', 'wifi', 'mesh', 'applications']

    module = bld.create_ns3_module(job, dependencies)

    module.includes = '.'

    module.includes = '.'

    module.source = [

    module.source = [

        'model/dsdv-rtable.cc',

        'model/dsdv-rtable.cc',

Lines 10-16	Link Here

        'model/dsdv-routing-protocol.cc',

        'model/dsdv-routing-protocol.cc',

        'helper/dsdv-helper.cc',

        'helper/dsdv-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.includes = '.'

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('dsdv')

    module_test = bld.create_ns3_module_test_library('dsdv')

    module_test.source = [

    module_test.source = [

        'test/dsdv-testcase.cc',

        'test/dsdv-testcase.cc',

(-)ns3.orig/ns-3.11/src/emu/wscript (-2 / +11 lines)

Lines 20-26	Link Here

        conf.env.append_value('NS3_EXECUTABLE_PATH', emucreatordir)

        conf.env.append_value('NS3_EXECUTABLE_PATH', emucreatordir)

def build(bld):

def build(bld):

    module = bld.create_ns3_module('emu', ['network'])

    job = 'emu'

    dependencies = ['network']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

Lines 46-52	Link Here

        'model/emu-sock-creator.cc',

        'model/emu-sock-creator.cc',

        'model/emu-encode-decode.cc',

        'model/emu-encode-decode.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    if bld.env['ENABLE_EXAMPLES']:

    if bld.env['ENABLE_EXAMPLES']:

        bld.add_subdirs('examples')

        bld.add_subdirs('examples')

(-)ns3.orig/ns-3.11/src/energy/wscript (-5 / +14 lines)

Lines 1-8	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('energy', ['internet', 'wifi'])

    job = 'energy'

    obj.source = [

    dependencies = ['internet', 'wifi']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/wifi-radio-energy-model.cc',

        'model/wifi-radio-energy-model.cc',

        'model/energy-source.cc',

        'model/energy-source.cc',

        'model/basic-energy-source.cc',

        'model/basic-energy-source.cc',

Lines 17-25	Link Here

        'helper/wifi-radio-energy-model-helper.cc',

        'helper/wifi-radio-energy-model-helper.cc',

        'helper/rv-battery-model-helper.cc',

        'helper/rv-battery-model-helper.cc',

    obj_test = bld.create_ns3_module_test_library('energy')

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    obj_test.source = [

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('energy')

    module_test.source = [

        'test/basic-energy-model-test.cc',

        'test/basic-energy-model-test.cc',

        'test/rv-battery-model-test.cc',

        'test/rv-battery-model-test.cc',

        'test/li-ion-energy-source-test.cc',

        'test/li-ion-energy-source-test.cc',

(-)ns3.orig/ns-3.11/src/flow-monitor/wscript (-4 / +13 lines)

Lines 1-8	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('flow-monitor', ['internet', 'config-store', 'tools'])

    job = 'flow-monitor'

    obj.source = ["model/%s" % s for s in [

    dependencies = ['internet', 'config-store', 'tools']

    module = bld.create_ns3_module(job, dependencies)

    module.source = ["model/%s" % s for s in [

       'flow-monitor.cc',

       'flow-monitor.cc',

       'flow-classifier.cc',

       'flow-classifier.cc',

       'flow-probe.cc',

       'flow-probe.cc',

Lines 10-17	Link Here

       'ipv4-flow-probe.cc',

       'ipv4-flow-probe.cc',

       'histogram.cc',

       'histogram.cc',

]]

]]

    obj.source.append("helper/flow-monitor-helper.cc")

    module.source.append("helper/flow-monitor-helper.cc")

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('flow-monitor')

    module_test = bld.create_ns3_module_test_library('flow-monitor')

    module_test.source = [

    module_test.source = [

        'test/histogram-test-suite.cc',

        'test/histogram-test-suite.cc',

(-)ns3.orig/ns-3.11/src/internet/wscript (-8 / +18 lines)

Lines 92-99	Link Here

def build(bld):

def build(bld):

    # bridge and mpi dependencies are due to global routing

    # bridge and mpi dependencies are due to global routing

    obj = bld.create_ns3_module('internet', ['bridge', 'mpi', 'network', 'core'])

    job = 'internet'

    obj.source = [

    dependencies = ['bridge', 'mpi', 'network', 'core']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/ipv4-l4-protocol.cc',

100

        'model/ipv4-l4-protocol.cc',

        'model/udp-header.cc',

101

        'model/udp-header.cc',

        'model/tcp-header.cc',

102

        'model/tcp-header.cc',

Lines 275-288	Link Here

275

278

276

279

277

    if bld.env['NSC_ENABLED']:

280

    if bld.env['NSC_ENABLED']:

278

        obj.source.append ('model/nsc-tcp-socket-impl.cc')

281

        module.source.append ('model/nsc-tcp-socket-impl.cc')

279

        obj.source.append ('model/nsc-tcp-l4-protocol.cc')

282

        module.source.append ('model/nsc-tcp-l4-protocol.cc')

280

        obj.source.append ('model/nsc-tcp-socket-factory-impl.cc')

283

        module.source.append ('model/nsc-tcp-socket-factory-impl.cc')

281

        obj.source.append ('model/nsc-sysctl.cc')

284

        module.source.append ('model/nsc-sysctl.cc')

282

        headers.source.append('model/nsc-tcp-l4-protocol.h')

285

        headers.source.append('model/nsc-tcp-l4-protocol.h')

283

        obj.uselib           = 'DL'

286

        module.uselib           = 'DL'

284

        internet_test.uselib = 'DL'

287

        internet_test.uselib = 'DL'

285

288

289

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

290

    static_module.source = ' '.join(module.source)

291

    static_module.target = 'ns3-' + job

292

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

293

    static_module.module_deps    = list(dependencies)

294

    static_module.uselib         = module.uselib

295

286

    if (bld.env['ENABLE_EXAMPLES']):

296

    if (bld.env['ENABLE_EXAMPLES']):

287

        bld.add_subdirs('examples')

297

        bld.add_subdirs('examples')

288

298

(-)ns3.orig/ns-3.11/src/lte/wscript (-3 / +11 lines)

Lines 1-8	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    job = 'lte'

    module = bld.create_ns3_module('lte', ['internet', 'spectrum', 'wimax'])

    dependencies = ['internet', 'spectrum', 'wimax']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

        'model/lte-spectrum-phy.cc',

        'model/lte-spectrum-phy.cc',

        'model/enb-lte-spectrum-phy.cc',

        'model/enb-lte-spectrum-phy.cc',

Lines 38-44	Link Here

        'model/ideal-control-messages.cc',

        'model/ideal-control-messages.cc',

        'helper/lte-helper.cc',

        'helper/lte-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('lte')

    module_test = bld.create_ns3_module_test_library('lte')

    module_test.source = [

    module_test.source = [

        'test/lte-phy-test.cc',

        'test/lte-phy-test.cc',

(-)ns3.orig/ns-3.11/src/mesh/wscript (-5 / +14 lines)

Lines 1-9	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('mesh', ['internet', 'wifi', 'bridge', 'applications'])

    job = 'mesh'

    dependencies = ['internet', 'wifi', 'bridge', 'applications']

    module = bld.create_ns3_module(job, dependencies)

    obj.source = [

    module.source = [

        'model/mesh-information-element-vector.cc',

        'model/mesh-information-element-vector.cc',

        'model/mesh-point-device.cc',

        'model/mesh-point-device.cc',

        'model/mesh-l2-routing-protocol.cc',

        'model/mesh-l2-routing-protocol.cc',

Lines 38-45	Link Here

        'helper/flame/flame-installer.cc',

        'helper/flame/flame-installer.cc',

    obj_test = bld.create_ns3_module_test_library('mesh')

    module_test = bld.create_ns3_module_test_library('mesh')

    obj_test.source = [

    module_test.source = [

        'test/mesh-information-element-vector-test-suite.cc',

        'test/mesh-information-element-vector-test-suite.cc',

        'test/dot11s/dot11s-test-suite.cc',

        'test/dot11s/dot11s-test-suite.cc',

        'test/dot11s/pmp-regression.cc',

        'test/dot11s/pmp-regression.cc',

Lines 52-58	Link Here

        'test/flame/flame-regression.cc',

        'test/flame/flame-regression.cc',

        'test/flame/regression.cc',

        'test/flame/regression.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'mesh'

    headers.module = 'mesh'

    headers.source = [

    headers.source = [

(-)ns3.orig/ns-3.11/src/mobility/wscript (-5 / +14 lines)

Lines 1-8	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    mobility = bld.create_ns3_module('mobility', ['network'])

    job = 'mobility'

    mobility.source = [

    dependencies = ['network']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/box.cc',

        'model/box.cc',

        'model/constant-acceleration-mobility-model.cc',

        'model/constant-acceleration-mobility-model.cc',

        'model/constant-position-mobility-model.cc',

        'model/constant-position-mobility-model.cc',

Lines 22-30	Link Here

        'helper/mobility-helper.cc',

        'helper/mobility-helper.cc',

        'helper/ns2-mobility-helper.cc',

        'helper/ns2-mobility-helper.cc',

    mobility_test = bld.create_ns3_module_test_library('mobility')

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    mobility_test.source = [

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('mobility')

    module_test.source = [

        'test/ns2-mobility-helper-test-suite.cc',

        'test/ns2-mobility-helper-test-suite.cc',

        'test/steady-state-random-waypoint-mobility-model-test.cc',

        'test/steady-state-random-waypoint-mobility-model-test.cc',

        'test/waypoint-mobility-model-test.cc',

        'test/waypoint-mobility-model-test.cc',

(-)ns3.orig/ns-3.11/src/mpi/wscript (-3 / +12 lines)

Lines 30-37	Link Here

def build(bld):

def build(bld):

    env = bld.env_of_name('default')

    env = bld.env_of_name('default')

    sim = bld.create_ns3_module('mpi', ['core', 'network'])

    job = 'mpi'

    sim.source = [

    dependencies = ['core', 'network']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/distributed-simulator-impl.cc',

        'model/distributed-simulator-impl.cc',

        'model/mpi-interface.cc',

        'model/mpi-interface.cc',

        'model/mpi-receiver.cc',

        'model/mpi-receiver.cc',

Lines 46-52	Link Here

    if env['ENABLE_MPI']:

    if env['ENABLE_MPI']:

        sim.uselib = 'MPI'

        module.uselib = 'MPI'

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.uselib = module.uselib

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    if bld.env['ENABLE_EXAMPLES']:

    if bld.env['ENABLE_EXAMPLES']:

        bld.add_subdirs('examples')

        bld.add_subdirs('examples')

(-)ns3.orig/ns-3.11/src/netanim/wscript (-2 / +12 lines)

Lines 1-12	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('netanim', ['internet', 'mobility'])

    job = 'netanim'

    dependencies = ['internet', 'mobility']

    module = bld.create_ns3_module(job, dependencies)

    module.includes = '.'

    module.includes = '.'

    module.source = [

    module.source = [

        'model/animation-interface.cc',

        'model/animation-interface.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.includes = module.includes

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'netanim'

    headers.module = 'netanim'

    headers.source = [

    headers.source = [

(-)ns3.orig/ns-3.11/src/network/wscript (-5 / +14 lines)

Lines 1-8	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    network = bld.create_ns3_module('network', ['core'])

    job = 'network'

    network.source = [

    dependencies = ['core']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/address.cc',

        'model/address.cc',

        'model/application.cc',

        'model/application.cc',

        'model/buffer.cc',

        'model/buffer.cc',

Lines 55-63	Link Here

        'helper/packet-socket-helper.cc',

        'helper/packet-socket-helper.cc',

        'helper/trace-helper.cc',

        'helper/trace-helper.cc',

    network_test = bld.create_ns3_module_test_library('network')

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    network_test.source = [

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('network')

    module_test.source = [

        'test/buffer-test.cc',

        'test/buffer-test.cc',

        'test/drop-tail-queue-test-suite.cc',

        'test/drop-tail-queue-test-suite.cc',

        'test/packetbb-test-suite.cc',

        'test/packetbb-test-suite.cc',

(-)ns3.orig/ns-3.11/src/nix-vector-routing/wscript (-2 / +12 lines)

Lines 1-13	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('nix-vector-routing', ['internet'])

    job = 'nix-vector-routing'

    dependencies = ['internet']

    module = bld.create_ns3_module(job, dependencies)

    module.includes = '.'

    module.includes = '.'

    module.source = [

    module.source = [

        'model/ipv4-nix-vector-routing.cc',

        'model/ipv4-nix-vector-routing.cc',

	'helper/ipv4-nix-vector-helper.cc',

	'helper/ipv4-nix-vector-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.includes = module.includes

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'nix-vector-routing'

    headers.module = 'nix-vector-routing'

    headers.source = [

    headers.source = [

(-)ns3.orig/ns-3.11/src/olsr/wscript (-2 / +12 lines)

Lines 1-7	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('olsr', ['internet', 'config-store', 'tools', 'point-to-point', 'wifi', 'mobility', 'applications', 'csma'])

    job = 'olsr'

    dependencies = ['internet', 'config-store', 'tools', 'point-to-point', 'wifi', 'mobility', 'applications', 'csma']

    module = bld.create_ns3_module('olsr', dependencies)

    module.includes = '.'

    module.includes = '.'

    module.source = [

    module.source = [

        'model/olsr-header.cc',

        'model/olsr-header.cc',

Lines 9-15	Link Here

        'model/olsr-routing-protocol.cc',

        'model/olsr-routing-protocol.cc',

        'helper/olsr-helper.cc',

        'helper/olsr-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.includes = module.includes

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('olsr')

    module_test = bld.create_ns3_module_test_library('olsr')

    module_test.source = [

    module_test.source = [

        'test/bug780-test.cc',

        'test/bug780-test.cc',






def build(bld):
    job = 'openflow'
    dependencies = ['internet']
    
    # Build the Switch module
    module = bld.create_ns3_module(job, dependencies)
    module.source = [
        ]

    module_test = bld.create_ns3_module_test_library('openflow')
    module_test.source = [
        ]

    if bld.env['OPENFLOW'] and bld.env['DL'] and bld.env['XML2']:
	module.uselib      = 'OPENFLOW DL XML2' 
	module_test.uselib = 'OPENFLOW DL XML2' 

    headers = bld.new_task_gen('ns3header')
    headers.module = 'openflow'

        ]

    if bld.env['ENABLE_OPENFLOW']:
	module.source.append('model/openflow-interface.cc')
        module.source.append('model/openflow-switch-net-device.cc')
	module.source.append('helper/openflow-switch-helper.cc')
	module_test.source.append('test/openflow-switch-test-suite.cc')
	headers.source.append('model/openflow-interface.h')
        headers.source.append('model/openflow-switch-net-device.h')
	headers.source.append('helper/openflow-switch-helper.h')
    
    static_module = bld.new_task_gen('cxx', 'cstaticlib')
    static_module.source = ' '.join(module.source)
    static_module.uselib = module.uselib
    static_module.target = 'ns3-' + job
    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]
    static_module.module_deps    = list(dependencies)
    
    if bld.env['ENABLE_EXAMPLES'] and bld.env['ENABLE_OPENFLOW']:
        bld.add_subdirs('examples')

(-)ns3.orig/ns-3.11/src/point-to-point-layout/wscript (-2 / +12 lines)

Lines 1-14	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('point-to-point-layout', ['internet', 'point-to-point', 'mobility', 'netanim'])

    job = 'point-to-point-layout'

    dependencies = ['internet', 'point-to-point', 'mobility', 'netanim']

    module = bld.create_ns3_module(job, dependencies)

    module.includes = '.'

    module.includes = '.'

    module.source = [

    module.source = [

        'model/point-to-point-dumbbell.cc',

        'model/point-to-point-dumbbell.cc',

        'model/point-to-point-grid.cc',

        'model/point-to-point-grid.cc',

        'model/point-to-point-star.cc',

        'model/point-to-point-star.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.includes = module.includes

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'point-to-point-layout'

    headers.module = 'point-to-point-layout'

    headers.source = [

    headers.source = [

(-)ns3.orig/ns-3.11/src/point-to-point/wscript (-2 / +11 lines)

Lines 2-8	Link Here

def build(bld):

def build(bld):

    module = bld.create_ns3_module('point-to-point', ['network', 'mpi'])

    job = 'point-to-point'

    dependencies = ['network', 'mpi']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

        'model/point-to-point-net-device.cc',

        'model/point-to-point-net-device.cc',

        'model/point-to-point-channel.cc',

        'model/point-to-point-channel.cc',

Lines 10-16	Link Here

        'model/ppp-header.cc',

        'model/ppp-header.cc',

        'helper/point-to-point-helper.cc',

        'helper/point-to-point-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('point-to-point')

    module_test = bld.create_ns3_module_test_library('point-to-point')

    module_test.source = [

    module_test.source = [

        'test/point-to-point-test.cc',

        'test/point-to-point-test.cc',

(-)ns3.orig/ns-3.11/src/propagation/wscript (-1 / +11 lines)

Lines 1-7	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('propagation', ['network', 'mobility'])

    job = 'propagation'

    dependencies = ['network', 'mobility']

    module = bld.create_ns3_module(job, dependencies)

    module.includes = '.'

    module.includes = '.'

    module.source = [

    module.source = [

        'model/propagation-delay-model.cc',

        'model/propagation-delay-model.cc',

Lines 10-15	Link Here

        'model/cost231-propagation-loss-model.cc',

        'model/cost231-propagation-loss-model.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.includes = module.includes

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('propagation')

    module_test = bld.create_ns3_module_test_library('propagation')

    module_test.source = [

    module_test.source = [

        'test/propagation-loss-model-test-suite.cc',

        'test/propagation-loss-model-test-suite.cc',

(-)ns3.orig/ns-3.11/src/spectrum/wscript (-3 / +11 lines)

Lines 1-8	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    job = 'spectrum'

    module = bld.create_ns3_module('spectrum', ['internet', 'propagation', 'applications'])

    dependencies = ['internet', 'propagation', 'applications']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

        'model/spectrum-model.cc',

        'model/spectrum-model.cc',

        'model/spectrum-value.cc',

        'model/spectrum-value.cc',

Lines 31-37	Link Here

        'helper/waveform-generator-helper.cc',

        'helper/waveform-generator-helper.cc',

        'helper/spectrum-analyzer-helper.cc',

        'helper/spectrum-analyzer-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('spectrum')

    module_test = bld.create_ns3_module_test_library('spectrum')

    module_test.source = [

    module_test.source = [

        'test/spectrum-interference-test.cc',

        'test/spectrum-interference-test.cc',

(-)ns3.orig/ns-3.11/src/stats/wscript (-5 / +15 lines)

Lines 8-15	Link Here

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('stats', ['network'])

    job = 'stats'

    obj.source = [

    dependencies = ['network']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/data-calculator.cc',

        'model/data-calculator.cc',

        'model/packet-data-calculators.cc',

        'model/packet-data-calculators.cc',

        'model/time-data-calculators.cc',

        'model/time-data-calculators.cc',

Lines 31-37	Link Here

    if bld.env['SQLITE_STATS']:

    if bld.env['SQLITE_STATS']:

        headers.source.append('model/sqlite-data-output.h')

        headers.source.append('model/sqlite-data-output.h')

        obj.source.append('model/sqlite-data-output.cc')

        module.source.append('model/sqlite-data-output.cc')

        obj.uselib = 'SQLITE3'

        module.uselib = 'SQLITE3'

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.uselib = module.uselib

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    bld.ns3_python_bindings()

    bld.ns3_python_bindings()

(-)ns3.orig/ns-3.11/src/tap-bridge/wscript (-2 / +10 lines)

Lines 20-26	Link Here

        conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir)

        conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir)

def build(bld):

def build(bld):

    module = bld.create_ns3_module('tap-bridge', ['network', 'internet'])

    job = 'tap-bridge'

    dependencies = ['network', 'internet']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

Lines 41-47	Link Here

            'model/tap-bridge.h',

            'model/tap-bridge.h',

            'helper/tap-bridge-helper.h',

            'helper/tap-bridge-helper.h',

])

])

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    if not bld.env['PLATFORM'].startswith('freebsd'):

    if not bld.env['PLATFORM'].startswith('freebsd'):

        obj = bld.create_suid_program('tap-creator')

        obj = bld.create_suid_program('tap-creator')




    conf.sub_config('perf')

def build(bld):
    module = bld.create_ns3_module('test', ['internet', 'mobility', 'applications', 'csma', 'bridge', 'config-store', 'tools', 'point-to-point', 'csma-layout'])
    headers = bld.new_task_gen('ns3header')
    headers.module = 'test'

    module_test = bld.create_ns3_module_test_library('test')
    module_test.source = [
        'csma-system-test-suite.cc',
        'global-routing-test-suite.cc',
        'static-routing-test-suite.cc',

(-)ns3.orig/ns-3.11/src/tools/wscript (-2 / +10 lines)

Lines 1-14	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    job = 'tools'

    module = bld.create_ns3_module('tools', ['network'])

    dependencies = ['network']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

        'model/event-garbage-collector.cc',

        'model/event-garbage-collector.cc',

        'model/gnuplot.cc',

        'model/gnuplot.cc',

        'model/delay-jitter-estimation.cc',

        'model/delay-jitter-estimation.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('tools')

    module_test = bld.create_ns3_module_test_library('tools')

    module_test.source = [

    module_test.source = [

        'test/event-garbage-collector-test-suite.cc',

        'test/event-garbage-collector-test-suite.cc',

(-)ns3.orig/ns-3.11/src/topology-read/wscript (-3 / +12 lines)

Lines 1-15	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('topology-read', ['network'])

    job = 'topology-read'

    obj.source = [

    dependencies = ['network']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

       'model/topology-reader.cc',

       'model/topology-reader.cc',

       'model/inet-topology-reader.cc',

       'model/inet-topology-reader.cc',

       'model/orbis-topology-reader.cc',

       'model/orbis-topology-reader.cc',

       'model/rocketfuel-topology-reader.cc',

       'model/rocketfuel-topology-reader.cc',

       'helper/topology-reader-helper.cc',

       'helper/topology-reader-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('topology-read')

    module_test = bld.create_ns3_module_test_library('topology-read')

    module_test.source = [

    module_test.source = [

        'test/rocketfuel-topology-reader-test-suite.cc',

        'test/rocketfuel-topology-reader-test-suite.cc',

(-)ns3.orig/ns-3.11/src/uan/wscript (-2 / +11 lines)

Lines 1-7	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('uan', ['network', 'energy'])

    job = 'uan'

    dependencies = ['network', 'energy']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

        'model/uan-channel.cc',

        'model/uan-channel.cc',

        'model/uan-phy-gen.cc',

        'model/uan-phy-gen.cc',

Lines 26-32	Link Here

        'helper/uan-helper.cc',

        'helper/uan-helper.cc',

        'helper/acoustic-modem-energy-model-helper.cc',

        'helper/acoustic-modem-energy-model-helper.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('uan')

    module_test = bld.create_ns3_module_test_library('uan')

    module_test.source = [

    module_test.source = [

        'test/uan-test.cc',

        'test/uan-test.cc',

(-)ns3.orig/ns-3.11/src/virtual-net-device/wscript (-1 / +11 lines)

Lines 2-11	Link Here

def build(bld):

def build(bld):

    module = bld.create_ns3_module('virtual-net-device', ['network', 'internet'])

    job = 'virtual-net-device'

    dependencies = ['network', 'internet']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

    module.source = [

        'model/virtual-net-device.cc',

        'model/virtual-net-device.cc',

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'virtual-net-device'

    headers.module = 'virtual-net-device'

    headers.source = [

    headers.source = [

(-)ns3.orig/ns-3.11/src/visualizer/wscript (-2 / +13 lines)

Lines 6-12	Link Here

    headers.source = [

    headers.source = [

    module = bld.create_ns3_module('visualizer', ['network', 'wifi'])

    job = 'visualizer'

    dependencies = ['network', 'wifi']

    module = bld.create_ns3_module(job, dependencies)

    if not bld.env['ENABLE_PYTHON_BINDINGS']:

    if not bld.env['ENABLE_PYTHON_BINDINGS']:

        return

        return

Lines 23-27	Link Here

    else:

    else:

        module.source = [

        module.source = [

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    static_module.features.append('pyembed')

    static_module.source = ' '.join(module.source)

    static_module.includes = module.includes

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    bld.ns3_python_bindings()

    bld.ns3_python_bindings()

(-)ns3.orig/ns-3.11/src/wifi/wscript (-7 / +17 lines)

Lines 1-8	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('wifi', ['network', 'propagation'])

    job = 'wifi'

    obj.source = [

    dependencies = ['network', 'propagation']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

        'model/wifi-information-element.cc',

        'model/wifi-information-element.cc',

        'model/wifi-information-element-vector.cc',

        'model/wifi-information-element-vector.cc',

        'model/wifi-channel.cc',

        'model/wifi-channel.cc',

Lines 67-74	Link Here

        'helper/qos-wifi-mac-helper.cc',

        'helper/qos-wifi-mac-helper.cc',

    obj_test = bld.create_ns3_module_test_library('wifi')

    module_test = bld.create_ns3_module_test_library('wifi')

    obj_test.source = [

    module_test.source = [

        'test/block-ack-test-suite.cc',

        'test/block-ack-test-suite.cc',

        'test/dcf-manager-test.cc',

        'test/dcf-manager-test.cc',

        'test/tx-duration-test.cc',

        'test/tx-duration-test.cc',

Lines 139-147	Link Here

139

142

140

143

141

    if bld.env['ENABLE_GSL']:

144

    if bld.env['ENABLE_GSL']:

142

        obj.uselib      = 'GSL GSLCBLAS M'

145

        module.uselib      = 'GSL GSLCBLAS M'

143

        obj_test.uselib = 'GSL GSLCBLAS M'

146

        module_test.uselib = 'GSL GSLCBLAS M'

144

147

148

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

149

    static_module.source = ' '.join(module.source)

150

    static_module.uselib = module.uselib

151

    static_module.target = 'ns3-' + job

152

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

153

    static_module.module_deps    = list(dependencies)

154

145

    obj = bld.create_ns3_program('wifi-phy-test',

155

    obj = bld.create_ns3_program('wifi-phy-test',

146

        ['core', 'mobility', 'network', 'wifi'])

156

        ['core', 'mobility', 'network', 'wifi'])

147

    obj.source = 'test/wifi-phy-test.cc'

157

    obj.source = 'test/wifi-phy-test.cc'

(-)ns3.orig/ns-3.11/src/wimax/wscript (-4 / +13 lines)

Lines 1-7	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    obj = bld.create_ns3_module('wimax', ['network', 'spectrum', 'point-to-point'])

    job = 'wimax'

    obj.source = [

    dependencies = ['network', 'spectrum', 'point-to-point']

    module = bld.create_ns3_module(job, dependencies)

    module.source = [

            'model/cid.cc',

            'model/cid.cc',

            'model/cid-factory.cc',

            'model/cid-factory.cc',

            'model/wimax-net-device.cc',

            'model/wimax-net-device.cc',

Lines 52-59	Link Here

            'helper/wimax-helper.cc',

            'helper/wimax-helper.cc',

    obj_test = bld.create_ns3_module_test_library('wimax')

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

    obj_test.source = [

    static_module.source = ' '.join(module.source)

    static_module.target = 'ns3-' + job

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

    static_module.module_deps    = list(dependencies)

    module_test = bld.create_ns3_module_test_library('wimax')

    module_test.source = [

            'test/wimax-tlv-test.cc',

            'test/wimax-tlv-test.cc',

            'test/mac-messages-test.cc',

            'test/mac-messages-test.cc',

            'test/wimax-service-flow-test.cc',

            'test/wimax-service-flow-test.cc',

(-)ns3.orig/ns-3.11/src/core/wscript (-19 / +29 lines)

Lines 95-103	Link Here

def build(bld):

def build(bld):

    bld.install_files('${PREFIX}/include/ns3', '../../ns3/core-config.h')

    bld.install_files('${PREFIX}/include/ns3', '../../ns3/core-config.h')

    job = 'core'

    dependencies = []

100

    core = bld.create_ns3_module('core')

101

    module = bld.create_ns3_module('core')

100

    core.source = [

102

    module.source = [

101

        'model/time.cc',

103

        'model/time.cc',

102

        'model/event-id.cc',

104

        'model/event-id.cc',

103

        'model/scheduler.cc',

105

        'model/scheduler.cc',

Lines 146-153	Link Here

146

        'model/fatal-impl.cc',

148

        'model/fatal-impl.cc',

147

149

148

150

149

    core_test = bld.create_ns3_module_test_library('core')

151

    module_test = bld.create_ns3_module_test_library('core')

150

    core_test.source = [

152

    module_test.source = [

151

        'test/attribute-test-suite.cc',

153

        'test/attribute-test-suite.cc',

152

        'test/callback-test-suite.cc',

154

        'test/callback-test-suite.cc',

153

        'test/command-line-test-suite.cc',

155

        'test/command-line-test-suite.cc',

Lines 238-248	Link Here

238

240

239

241

240

    if sys.platform == 'win32':

242

    if sys.platform == 'win32':

241

        core.source.extend([

243

        module.source.extend([

242

            'model/win32-system-wall-clock-ms.cc',

244

            'model/win32-system-wall-clock-ms.cc',

243

])

245

])

244

    else:

246

    else:

245

        core.source.extend([

247

        module.source.extend([

246

            'model/unix-system-wall-clock-ms.cc',

248

            'model/unix-system-wall-clock-ms.cc',

247

])

249

])

248

250

Lines 252-260	Link Here

252

        headers.source.extend(['model/int64x64-double.h'])

254

        headers.source.extend(['model/int64x64-double.h'])

253

    elif env['INT64X64_USE_128']:

255

    elif env['INT64X64_USE_128']:

254

        headers.source.extend(['model/int64x64-128.h'])

256

        headers.source.extend(['model/int64x64-128.h'])

255

        core.source.extend(['model/int64x64-128.cc'])

257

        module.source.extend(['model/int64x64-128.cc'])

256

    elif env['INT64X64_USE_CAIRO']:

258

    elif env['INT64X64_USE_CAIRO']:

257

        core.source.extend([

259

        module.source.extend([

258

            'model/int64x64-cairo.cc',

260

            'model/int64x64-cairo.cc',

259

])

261

])

260

        headers.source.extend([

262

        headers.source.extend([

Lines 267-291	Link Here

267

                'model/realtime-simulator-impl.h',

269

                'model/realtime-simulator-impl.h',

268

                'model/wall-clock-synchronizer.h',

270

                'model/wall-clock-synchronizer.h',

269

])

271

])

270

        core.source.extend([

272

        module.source.extend([

271

                'model/realtime-simulator-impl.cc',

273

                'model/realtime-simulator-impl.cc',

272

                'model/wall-clock-synchronizer.cc',

274

                'model/wall-clock-synchronizer.cc',

273

])

275

])

274

        core.uselib      = 'RT'

276

        module.uselib      = 'RT'

275

        core_test.uselib = 'RT'

277

        module_test.uselib = 'RT'

276

    else:

278

    else:

277

        core.uselib      = ''

279

        module.uselib      = ''

278

        core_test.uselib = ''

280

        module_test.uselib = ''

279

281

280

    if env['ENABLE_THREADING']:

282

    if env['ENABLE_THREADING']:

281

        core.source.extend([

283

        module.source.extend([

282

            'model/unix-fd-reader.cc',

284

            'model/unix-fd-reader.cc',

283

            'model/unix-system-thread.cc',

285

            'model/unix-system-thread.cc',

284

            'model/unix-system-mutex.cc',

286

            'model/unix-system-mutex.cc',

285

            'model/unix-system-condition.cc',

287

            'model/unix-system-condition.cc',

286

])

288

])

287

        core.uselib      = core.uselib      + ' PTHREAD'

289

        module.uselib      = module.uselib      + ' PTHREAD'

288

        core_test.uselib = core_test.uselib + ' PTHREAD'

290

        module_test.uselib = module_test.uselib + ' PTHREAD'

289

        headers.source.extend([

291

        headers.source.extend([

290

                'model/unix-fd-reader.h',

292

                'model/unix-fd-reader.h',

291

                'model/system-mutex.h',

293

                'model/system-mutex.h',

Lines 294-302	Link Here

294

])

296

])

295

297

296

    if env['ENABLE_GSL']:

298

    if env['ENABLE_GSL']:

297

        core.uselib      = core.uselib      + ' GSL GSLCBLAS M'

299

        module.uselib      = module.uselib      + ' GSL GSLCBLAS M'

298

        core_test.uselib = core_test.uselib + ' GSL GSLCBLAS M'

300

        module_test.uselib = module_test.uselib + ' GSL GSLCBLAS M'

299

        core_test.source.extend(['test/rng-test-suite.cc'])

301

        module_test.source.extend(['test/rng-test-suite.cc'])

302

303

    static_module = bld.new_task_gen('cxx', 'cstaticlib')

304

    static_module.includes = '.'

305

    static_module.uselib = module.uselib

306

    static_module.source = ' '.join(module.source)

307

    static_module.target = 'ns3-' + job

308

    static_module.uselib_local   = ['ns3-' + dep for dep in dependencies]

309

    static_module.module_deps    = list(dependencies)

300

310

301

    if (bld.env['ENABLE_EXAMPLES']):

311

    if (bld.env['ENABLE_EXAMPLES']):

302

        bld.add_subdirs('examples')

312

        bld.add_subdirs('examples')

Return to bug 1174