Solving compilation problems, adding more comments. Modified ccnx-test example
diff --git a/wscript b/wscript
index 0142dc2..64a7336 100644
--- a/wscript
+++ b/wscript
@@ -10,7 +10,7 @@
def configure(conf):
conf.check_tool('boost')
- conf.env['BOOST'] = conf.check_boost(lib = '', # need only base
+ conf.env['BOOST'] = conf.check_boost(lib = 'iostreams',
min_version='1.40.0' )
if not conf.env['BOOST']:
conf.report_optional_feature("ndn-abstract", "NDN abstraction", False,
@@ -22,13 +22,16 @@
def build(bld):
- module = bld.create_ns3_module ('NDNabstraction', ['applications', 'core', 'network', 'point-to-point','topology-read','visualizer'])
+ module = bld.create_ns3_module ('NDNabstraction', ['core', 'network', 'point-to-point',
+ 'topology-read'])
+ module.uselib = 'BOOST BOOST_IOSTREAMS'
tests = bld.create_ns3_module_test_library('NDNabstraction')
headers = bld.new_task_gen('ns3header')
headers.module = 'NDNabstraction'
if not bld.env['ENABLE_NDN_ABSTRACT']:
+ conf.env['MODULES_NOT_BUILT'].append('NDNabstraction')
return
module.find_sources_in_dirs (['model', 'apps', 'helper'],[],['.cc']);
@@ -36,28 +39,24 @@
headers.find_sources_in_dirs( ['model', 'apps', 'helper'], [], ['.h'] );
- for path in ["examples"]:
- anode = bld.path.find_dir (path)
- if not anode or not anode.is_child_of(bld.srcnode):
- raise Utils.WscriptError("Unable to use '%s' - either because \
- it's not a relative path"", or it's not child of \
- '%s'."%(name,bld.srcnode))
- bld.rescan(anode)
- for filename in bld.cache_dir_contents[anode.id]:
- if filename.startswith('.') or not filename.endswith(".cc"):
- continue
- name = filename[:-len(".cc")]
- obj = bld.create_ns3_program(name, ['NDNabstraction'])
- obj.path = obj.path.find_dir (path)
- obj.source = filename
- obj.target = name
- obj.name = obj.target
-
- if bld.env['ENABLE_OPENSSL']:
- module.uselib = 'OPENSSL'
-
- if bld.env['ENABLE_EXAMPLES']:
- bld.add_subdirs('examples')
+ if True or bld.env['ENABLE_EXAMPLES']:
+ for path in ["examples"]:
+ anode = bld.path.find_dir (path)
+ if not anode or not anode.is_child_of(bld.srcnode):
+ raise Utils.WscriptError("Unable to use '%s' - either because \
+ it's not a relative path"", or it's not child of \
+ '%s'."%(name,bld.srcnode))
+ bld.rescan(anode)
+ for filename in bld.cache_dir_contents[anode.id]:
+ if filename.startswith('.') or not filename.endswith(".cc"):
+ continue
+ name = filename[:-len(".cc")]
+ obj = bld.create_ns3_program(name, ['NDNabstraction'])
+ obj.path = obj.path.find_dir (path)
+ obj.source = filename
+ obj.target = name
+ obj.name = obj.target
+ obj.uselib = 'BOOST BOOST_IOSTREAMS'
bld.ns3_python_bindings()