commit 8fde22b8eeb3230ddc3aa95b6f1f7254f891b131
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Wed Aug 19 23:12:44 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 01 17:07:18 2015 -0700
tree 5838f04e0c42241f6ec339f5c8aaa422153939f3
parent 5b4c4677d090c168d9e985666a621181d31772b1

model+NFD/rib: Enable full-featured RIB manager

Change-Id: I033b29ed3cbcc1a98b7eae759792c832668253ee
Refs: #2370

wscript

diff --git a/wscript b/wscript
index 494cd43..71f2c9a 100644
--- a/wscript
+++ b/wscript
@@ -109,7 +109,7 @@
                                   excl=['ndn-cxx/src/**/*-osx.cpp',
                                         'ndn-cxx/src/util/dummy-client-face.cpp'])
 
-    nfdSrc = bld.path.ant_glob(['%s/**/*.cpp' % dir for dir in ['NFD/core', 'NFD/daemon']],
+    nfdSrc = bld.path.ant_glob(['%s/**/*.cpp' % dir for dir in ['NFD/core', 'NFD/daemon', 'NFD/rib']],
                                excl=['NFD/core/network-interface.cpp',
                                      'NFD/daemon/main.cpp',
                                      'NFD/daemon/nfd.cpp',
@@ -118,14 +118,15 @@
                                      'NFD/daemon/face/tcp*',
                                      'NFD/daemon/face/udp*',
                                      'NFD/daemon/face/unix-stream*',
-                                     'NFD/daemon/face/websocket*'])
+                                     'NFD/daemon/face/websocket*',
+                                     'NFD/rib/nrd.cpp'])
 
     module = bld.create_ns3_module('ndnSIM', deps)
     module.module = 'ndnSIM'
     module.features += ' ns3fullmoduleheaders ndncxxheaders'
     module.use += ['version-ndn-cxx', 'version-NFD', 'BOOST', 'CRYPTOPP', 'SQLITE3', 'RT', 'PTHREAD']
-    module.includes = ['../..', '../../ns3/ndnSIM/NFD', './NFD/core', './NFD/daemon', '../../ns3/ndnSIM', '../../ns3/ndnSIM/ndn-cxx']
-    module.export_includes = ['../../ns3/ndnSIM/NFD', './NFD/core', './NFD/daemon', '../../ns3/ndnSIM']
+    module.includes = ['../..', '../../ns3/ndnSIM/NFD', './NFD/core', './NFD/daemon', './NFD/rib', '../../ns3/ndnSIM', '../../ns3/ndnSIM/ndn-cxx']
+    module.export_includes = ['../../ns3/ndnSIM/NFD', './NFD/core', './NFD/daemon', './NFD/rib', '../../ns3/ndnSIM']
 
     headers = bld(features='ns3header')
     headers.module = 'ndnSIM'
@@ -139,7 +140,7 @@
     module.source = bld.path.ant_glob(['%s/**/*.cpp' % dir for dir in module_dirs],
                                       excl=['model/ip-faces/*']) + ndnCxxSrc + nfdSrc
 
-    module_dirs = ['NFD/core', 'NFD/daemon', 'apps', 'helper', 'model', 'utils']
+    module_dirs = ['NFD/core', 'NFD/daemon', 'NFD/rib', 'apps', 'helper', 'model', 'utils']
     module.full_headers = bld.path.ant_glob(['%s/**/*.hpp' % dir for dir in module_dirs])
     module.full_headers += bld.path.ant_glob('NFD/common.hpp')