commit 325c2533aac4507780ce4c42c3b21d63c36e9e95
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Sep 08 15:38:53 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Sep 11 11:42:40 2016 -0700
tree c1f05281ed11642bb8d92294e1757ff9d45ec70e
parent 0167d58064af56b830ebe278fec551ea7eeff7ef

NFD+ndn-cxx: Update version of submodules

- NFD: based on NFD:commit:704430ca07bda92019538b92379c276529efa04a (NFD-0.4.1-1-g704430c)
- ndn-cxx: based on ndn-cxx:commit:2e52d7cab4e03631db7f6c89a2daf7de590dd29e (ndn-cxx-0.4.1)

Note that code compiles, because all ndnSIM code is disabled.  Future
commits re-enable ndnSIM features.

Change-Id: Iff7daad6372eaa719db5af110a842afdcc319978
Refs: #3560

wscript

diff --git a/wscript b/wscript
index 71f2c9a..40f1468 100644
--- a/wscript
+++ b/wscript
@@ -110,13 +110,12 @@
                                         'ndn-cxx/src/util/dummy-client-face.cpp'])
 
     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',
+                               excl=['NFD/daemon/main.cpp',
                                      'NFD/daemon/nfd.cpp',
                                      'NFD/daemon/face/ethernet*',
                                      'NFD/daemon/face/multicast-udp*',
                                      'NFD/daemon/face/tcp*',
-                                     'NFD/daemon/face/udp*',
+                                     'NFD/daemon/face/*udp*',
                                      'NFD/daemon/face/unix-stream*',
                                      'NFD/daemon/face/websocket*',
                                      'NFD/rib/nrd.cpp'])
@@ -138,7 +137,12 @@
 
     module_dirs = ['apps', 'helper', 'model', 'utils']
     module.source = bld.path.ant_glob(['%s/**/*.cpp' % dir for dir in module_dirs],
-                                      excl=['model/ip-faces/*']) + ndnCxxSrc + nfdSrc
+                                      excl=[
+                                          'apps/*',
+                                          'model/**/*',
+                                          'helper/*',
+                                          'utils/**/*',
+                                          'model/ip-faces/*']) + ndnCxxSrc + nfdSrc
 
     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])
@@ -146,13 +150,13 @@
 
     module.ndncxx_headers = bld.path.ant_glob(['ndn-cxx/src/**/*.hpp'],
                                               excl=['src/**/*-osx.hpp', 'src/detail/**/*'])
-    if bld.env.ENABLE_EXAMPLES:
-        bld.recurse('examples')
+    # if bld.env.ENABLE_EXAMPLES:
+    #     bld.recurse('examples')
 
     if bld.env.ENABLE_TESTS:
         bld.recurse('tests')
 
-    bld.ns3_python_bindings()
+    # bld.ns3_python_bindings()
 
 @TaskGen.feature('ns3fullmoduleheaders')
 @TaskGen.after_method('process_rule')