build: Upgrade waf to version 2.0.6
This commit also includes:
- cleanup of build scripts
- replacing log4cxx with ndn-cxx logging facility
Change-Id: I96fd673a3cd2e06061e9efc1a7891e41cf97ea4f
diff --git a/.waf-tools/dependency-checker.py b/.waf-tools/dependency-checker.py
index 629fbfd..63199a5 100644
--- a/.waf-tools/dependency-checker.py
+++ b/.waf-tools/dependency-checker.py
@@ -4,10 +4,10 @@
from waflib.Configure import conf
def addDependencyOptions(self, opt, name, extraHelp=''):
- opt.add_option('--with-%s' % name, type='string', default=None,
- dest='with_%s' % name,
+ opt.add_option('--with-%s' % name, metavar='PATH',
help='Path to %s, e.g., /usr/local %s' % (name, extraHelp))
-setattr(Options.OptionsContext, "addDependencyOptions", addDependencyOptions)
+
+setattr(Options.OptionsContext, 'addDependencyOptions', addDependencyOptions)
@conf
def checkDependency(self, name, **kw):
@@ -18,8 +18,8 @@
kw['mandatory'] = kw.get('mandatory', True)
if root:
- isOk = self.check_cxx(includes="%s/include" % root,
- libpath="%s/lib" % root,
+ isOk = self.check_cxx(includes='%s/include' % root,
+ libpath='%s/lib' % root,
**kw)
else:
isOk = self.check_cxx(**kw)