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

(-)a/bindings/python/ns3modulegen.py (+6 lines)
 Lines 149-154    Link Here 
149 
            root_module.classes.remove(root_module['ns3::%s' % clsname])
 149 
            root_module.classes.remove(root_module['ns3::%s' % clsname])
150 
        root_module.enums.remove(root_module['ns3::TapBridge::Mode'])
 150 
        root_module.enums.remove(root_module['ns3::TapBridge::Mode'])
151 

          151
          

        

            

              
              
              152
              
    if 'NetAnim' not in enabled_features:

            

            

              153
              
        for clsname in ['PointToPointDumbbellHelper', 'PointToPointGridHelper',

            

            

              154
              
                        'AnimationInterface', 'NodeLocation']:

            

            

              155
              
            root_module.classes.remove(root_module['ns3::%s' % clsname])

            

            

              156
              
        

            

            

              157
              

            

        

          152
          
    root_module.generate(out, '_ns3')

          158
          
    root_module.generate(out, '_ns3')

        

        

          153
          

          159
          

        

        

          154
          
    out.close()

          160
          
    out.close()

        



(-)a/src/contrib/net-anim/wscript
      (-2 / +13 lines)




  

    

    

       Lines 1-7
       
    
  Link Here 
    

  

        

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

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

        

        

          2
          

          2
          

        

            

              
              
              3
              
def configure(conf):

            

            

              4
              
    conf.env['ENABLE_NET_ANIM'] = (conf.check(header_name='sys/socket.h')

            

            

              5
              
                                   and conf.check(header_name='netinet/in.h'))

            

            

              6
              
    conf.report_optional_feature("NetAnim", "NetAnim",

            

            

              7
              
                                 conf.env['ENABLE_NET_ANIM'],

            

            

              8
              
                                 "sys/socket.h or netinet/in.h not found")

            

            

              9
              

            

        

          3
          
def build(bld):

          10
          
def build(bld):

        

        

          4
          
    obj = bld.create_ns3_module('net-anim')

          11
          
    obj = bld.create_ns3_module('net-anim')

        

            

              
              
              12
              
    headers = bld.new_task_gen('ns3header')

            

            

              13
              
    headers.module = 'net-anim'

            

            

              14
              

            

            

              15
              
    if not bld.env['ENABLE_NET_ANIM']:

            

            

              16
              
        return

            

            

              17
              

            

        

          5
          
    obj.source = [

          18
          
    obj.source = [

        

        

          6
          
        'point-to-point-dumbbell-helper.cc',

          19
          
        'point-to-point-dumbbell-helper.cc',

        

        

          7
          
        'point-to-point-grid-helper.cc',

          20
          
        'point-to-point-grid-helper.cc',

        

  

    

    

       Lines 9-16
       
    
  Link Here 
    

  

        

          9
          
        'node-location.cc'

          22
          
        'node-location.cc'

        

        

          10
          
       ]

          23
          
       ]

        

        

          11
          

          24
          

        

            

              12
              
    headers = bld.new_task_gen('ns3header')

              
              
            

            

              13
              
    headers.module = 'net-anim'

            

        

          14
          
    headers.source = [

          25
          
    headers.source = [

        

        

          15
          
        'point-to-point-dumbbell-helper.h',

          26
          
        'point-to-point-dumbbell-helper.h',

        

        

          16
          
        'point-to-point-grid-helper.h',

          27
          
        'point-to-point-grid-helper.h',

        



(-)a/src/contrib/wscript
      (+1 lines)




  

    

    

       Lines 15-20
       
    
  Link Here 
    

  

        

          15
          
                                 conf.env['ENABLE_LIBXML2'],

          15
          
                                 conf.env['ENABLE_LIBXML2'],

        

        

          16
          
                                 "library 'libxml-2.0 >= 2.7' not found")

          16
          
                                 "library 'libxml-2.0 >= 2.7' not found")

        

        

          17
          
    conf.sub_config('stats')

          17
          
    conf.sub_config('stats')

        

            

              
              
              18
              
    conf.sub_config('net-anim')

            

        

          18
          

          19
          

        

        

          19
          
    conf.write_config_header('ns3/contrib-config.h', top=True)

          20
          
    conf.write_config_header('ns3/contrib-config.h', top=True)

        

        

          20
          

          21
          

        






  

  Return to bug 705