Attachment #1177 for bug #1174

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




    conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]


class ns3module_taskgen(TaskGen.task_gen):
    def __init__(self, *args, **kwargs):
        super(ns3module_taskgen, self).__init__(*args, **kwargs)

    def apply(self):
        static_enabled = False
        shared_enabled = True
        bld = self.bld
        if bld.env['ENABLE_STATIC_NS3']:
            static_enabled = True
            shared_enabled = False
        if bld.env['ENABLE_SHARED_AND_STATIC_NS3']:
            static_enabled = True
            shared_enabled = True

        assert self.name.startswith("ns3-")
        name = self.name.split("ns3-")[1]

        sub_taskgens = []
        if static_enabled:
            static = self._create_ns3_module(self.bld, name, self.dependencies, True)
            sub_taskgens.append(static)
        else:
            self.static = None
        if shared_enabled:
            shared = self._create_ns3_module(self.bld, name, self.dependencies, False)
            sub_taskgens.append(shared)
        else:
            self.shared = None

        for gen in sub_taskgens:
            gen.source = self.source
            gen.env = self.env.copy()
            features = list(self.features)
            features.remove("ns3module")
            gen.features.extend(features)
            gen.path = self.path
            gen.uselib = self.uselib
            if hasattr(self, 'includes'):
                gen.includes = self.includes
            if not hasattr(self, "is_ns3_module"):
                delattr(module, "is_ns3_module")

        if not self.test:
            pcfile = bld.new_task_gen('ns3pcfile')
            pcfile.module = sub_taskgens[0]


    def _create_ns3_module(self, bld, name, dependencies, static):
        # Create a separate library for this module.
        if static:
            module = bld.new_task_gen('cxx', 'cstaticlib')
        else:
            module = bld.new_task_gen('cxx', 'cshlib')

        # Initially create an empty value for this because the pcfile
        # writing task assumes every module has a uselib attribute.
        module.uselib = ''
        module.is_static = static
        module.is_ns3_module = True
        module.name = 'ns3-' + name
        module.vnum = wutils.VNUM
        # Add the proper path to the module's name.
        module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(self.path), name)
        # Set the libraries this module depends on.  
        module.uselib_local = ['ns3-' + dep for dep in dependencies]
        module.module_deps = list(dependencies)
        if not static:
            module.env.append_value('CXXFLAGS', module.env['shlib_CXXFLAGS'])
            module.env.append_value('CCFLAGS', module.env['shlib_CXXFLAGS'])
            # Turn on the link flags for shared libraries if we have the
            # proper compiler and platform.
            if module.env['CXX_NAME'] in ['gcc', 'icc'] and module.env['WL_SONAME_SUPPORTED']:
                # Get the module library name without any relative paths
                # at its beginning because all of the libraries will end
                # up in the same directory.
                module_library_name = os.path.basename(ccroot.get_target_name(module))
                module.env.append_value('LINKFLAGS', '-Wl,--soname=%s' % module_library_name)
        elif module.env['CXX_NAME'] in ['gcc', 'icc'] and \
                os.uname()[4] == 'x86_64' and \
                module.env['ENABLE_PYTHON_BINDINGS']:
            # enable that flag for static builds only on x86-64 platforms
            # when gcc is present and only when we want python bindings
            # (it's more efficient to not use this option if we can avoid it)
            module.env.append_value('CXXFLAGS', '-mcmodel=large')
            module.env.append_value('CCFLAGS', '-mcmodel=large')

        module.env.append_value('CXXDEFINES', "NS3_MODULE_COMPILATION")
        module.env.append_value('CCDEFINES', "NS3_MODULE_COMPILATION")

        module.install_path = "${LIBDIR}"

        return module


def create_ns3_module(bld, name, dependencies=(), test=False):
    module = bld.new_task_gen('ns3module')
    module.bld = bld
    module.name = "ns3-" + name
    module.dependencies = dependencies
        module = bld.new_task_gen('cxx', 'cshlib')
    if not test:
        pcfile = bld.new_task_gen('ns3pcfile')
        pcfile.module = module

    # Initially create an empty value for this because the pcfile
    # writing task assumes every module has a uselib attribute.
    module.uselib = ''

    module.is_ns3_module = True
    module.name = 'ns3-' + name
    module.vnum = wutils.VNUM
    # Add the proper path to the module's name.
    module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(bld.path), name)
    # Set the libraries this module depends on.  
    module.uselib_local = ['ns3-' + dep for dep in dependencies]
    module.module_deps = list(dependencies)
    module.test = test
    module.is_ns3_module = True
        module.env.append_value('CCFLAGS', module.env['shlib_CXXFLAGS'])
        # Turn on the link flags for shared libraries if we have the
        # proper compiler and platform.
        if module.env['CXX_NAME'] in ['gcc', 'icc'] and module.env['WL_SONAME_SUPPORTED']:
            # Get the module library name without any relative paths
            # at its beginning because all of the libraries will end
            # up in the same directory.
            module_library_name = os.path.basename(ccroot.get_target_name(module))
            module.env.append_value('LINKFLAGS', '-Wl,--soname=%s' % module_library_name)
    elif module.env['CXX_NAME'] in ['gcc', 'icc'] and \
            os.uname()[4] == 'x86_64' and \
            module.env['ENABLE_PYTHON_BINDINGS']:
        # enable that flag for static builds only on x86-64 platforms
        # when gcc is present and only when we want python bindings
        # (it's more efficient to not use this option if we can avoid it)
        module.env.append_value('CXXFLAGS', '-mcmodel=large')
        module.env.append_value('CCFLAGS', '-mcmodel=large')
        
    module.env.append_value('CXXDEFINES', "NS3_MODULE_COMPILATION")
    module.env.append_value('CCDEFINES', "NS3_MODULE_COMPILATION")
    return module


def create_ns3_module_test_library(bld, name):
    # Create an ns3 module for the test library that depends only on
    # the module being tested.

    def apply(self):
        for filename in set(self.to_list(self.source)):
            src_node = self.path.find_resource(filename)
            self.bld.install_files('${PREFIX}/include/ns3', [src_node])
        if self.module is None:
            raise Utils.WafError("'module' missing on ns3headers object %s" % self)
        ns3_dir_node = self.bld.path.find_dir("ns3")

            task = self.create_task('ns3header', env=self.env)
            task.mode = self.mode
            if self.mode == 'install':
                self.bld.install_files('${PREFIX}/include/ns3', [src_node])
                task.set_inputs([src_node])
                task.set_outputs([dst_node])
            else:

            raise Utils.WscriptError("error finding headers for module %s" % self.module)
        if not all_headers_inputs:
            return
        self.bld.install_files('${PREFIX}/include/ns3', 
                               ns3_dir_node.find_or_declare("%s-module.h" % self.module))
        all_headers_outputs = [ns3_dir_node.find_or_declare("%s-module.h" % self.module)]
        task = self.create_task('gen_ns3_module_header', env=self.env)
        task.module = self.module
        task.mode = self.mode
        if self.mode == 'install':
            self.bld.install_files('${PREFIX}/include/ns3', 
                                   ns3_dir_node.find_or_declare("%s-module.h" % self.module))
            task.set_inputs(all_headers_inputs)
            task.set_outputs(all_headers_outputs)
            module_obj = self.bld.name_to_obj("ns3-" + self.module, self.env)

(-)a/wscript (-5 / +18 lines)

Lines 58-64	Link Here

# local modules

# local modules

import wutils

import wutils

Configure.autoconfig = 1

#Configure.autoconfig = 1

# the following two variables are used by the target "waf dist"

# the following two variables are used by the target "waf dist"

VERSION = file("VERSION", "rt").read().strip()

VERSION = file("VERSION", "rt").read().strip()

Lines 207-212	Link Here

207

                   help=('Compile NS-3 statically: works only on linux, without python'),

207

                   help=('Compile NS-3 statically: works only on linux, without python'),

208

                   dest='enable_static', action='store_true',

208

                   dest='enable_static', action='store_true',

209

                   default=False)

209

                   default=False)

210

    opt.add_option('--enable-shared-and-static',

211

                   help=('Compile NS-3 both shared and static libraries at the same time: static works only on linux'),

212

                   dest='enable_shared_and_static', action='store_true',

213

                   default=False)

210

    opt.add_option('--enable-mpi',

214

    opt.add_option('--enable-mpi',

211

                   help=('Compile NS-3 with MPI and distributed simulation support'),

215

                   help=('Compile NS-3 with MPI and distributed simulation support'),

212

                   dest='enable_mpi', action='store_true',

216

                   dest='enable_mpi', action='store_true',

Lines 316-327	Link Here

316

                env['WL_SONAME_SUPPORTED'] = True

320

                env['WL_SONAME_SUPPORTED'] = True

317

321

318

    env['ENABLE_STATIC_NS3'] = False

322

    env['ENABLE_STATIC_NS3'] = False

319

    if Options.options.enable_static:

323

    if Options.options.enable_static or Options.options.enable_shared_and_static:

320

        if env['PLATFORM'].startswith('linux') and \

324

        if env['PLATFORM'].startswith('linux') and \

321

                env['CXX_NAME'] in ['gcc', 'icc']:

325

                env['CXX_NAME'] in ['gcc', 'icc']:

322

            if re.match('i[3-6]86', os.uname()[4]):

326

            if re.match('i[3-6]86', os.uname()[4]):

323

                conf.report_optional_feature("static", "Static build", True, '')

327

                conf.report_optional_feature("static", "Static build", True, '')

324

                env['ENABLE_STATIC_NS3'] = True

328

                if Options.options.enable_static:

329

                    env['ENABLE_STATIC_NS3'] = True

330

                if Options.options.enable_shared_and_static:

331

                    env['ENABLE_SHARED_AND_STATIC_NS3'] = True

325

            elif os.uname()[4] == 'x86_64':

332

            elif os.uname()[4] == 'x86_64':

326

                if env['ENABLE_PYTHON_BINDINGS'] and \

333

                if env['ENABLE_PYTHON_BINDINGS'] and \

327

                        not conf.check_compilation_flag('-mcmodel=large'):

334

                        not conf.check_compilation_flag('-mcmodel=large'):

Lines 332-343	Link Here

332

                                                     "compiler to at least gcc 4.3.x.")

339

                                                     "compiler to at least gcc 4.3.x.")

333

                else:

340

                else:

334

                    conf.report_optional_feature("static", "Static build", True, '')

341

                    conf.report_optional_feature("static", "Static build", True, '')

335

                    env['ENABLE_STATIC_NS3'] = True

342

                    if Options.options.enable_static:

343

                        env['ENABLE_STATIC_NS3'] = True

344

                    if Options.options.enable_shared_and_static:

345

                        env['ENABLE_SHARED_AND_STATIC_NS3'] = True

336

        elif env['CXX_NAME'] == 'gcc' and \

346

        elif env['CXX_NAME'] == 'gcc' and \

337

                (env['PLATFORM'].startswith('darwin') or \

347

                (env['PLATFORM'].startswith('darwin') or \

338

                     env['PLATFORM'].startswith('cygwin')):

348

                     env['PLATFORM'].startswith('cygwin')):

339

                conf.report_optional_feature("static", "Static build", True, '')

349

                conf.report_optional_feature("static", "Static build", True, '')

340

                env['ENABLE_STATIC_NS3'] = True

350

                if Options.options.enable_static:

351

                    env['ENABLE_STATIC_NS3'] = True

352

                if Options.options.enable_shared_and_static:

353

                    env['ENABLE_SHARED_AND_STATIC_NS3'] = True

341

        else:

354

        else:

342

            conf.report_optional_feature("static", "Static build", False,

355

            conf.report_optional_feature("static", "Static build", False,

343

                                         "Unsupported platform")

356

                                         "Unsupported platform")

Return to bug 1174