commit 71b712b9bd8bc58864f7b81434cb35157b779f09
author Chengyu Fan <chengy.fan@gmail.com> Wed Sep 09 22:13:56 2015 -0600
committer Chengyu Fan <chengy.fan@gmail.com> Mon Sep 21 20:26:56 2015 -0600
tree 4103aba9d02ba96884f19d3e7449b45b6eb17f69
parent 3b9bb34b3bd1ba37129b8585d1585819f0a76bc0

catalog: add logging and fix bugs

* use user-friendly messages
* fix help output

refs: #3189

Change-Id: I33dcb1a9c806d01c6665e0ef941d5b4f1d64774f

wscript

diff --git a/wscript b/wscript
index 28c51be..6b3c33a 100644
--- a/wscript
+++ b/wscript
@@ -33,11 +33,14 @@
 def options(opt):
     opt.load(['compiler_cxx', 'gnu_dirs'])
 
-    opt.load(['default-compiler-flags', 'boost'],
+    opt.load(['default-compiler-flags', 'boost', 'coverage'],
               tooldir=['.waf-tools'])
 
     opt = opt.add_option_group('ndn-atmos Options')
 
+    opt.add_option('--with-log4cxx', action='store_true', default=False, dest='log4cxx',
+                   help='''Compile with log4cxx''')
+
     opt.add_option('--with-tests', action='store_true', default=False,
                    dest='with_tests', help='''build unit tests''')
 
@@ -65,6 +68,11 @@
     conf.check_cfg(path='mysql_config', args=['--cflags', '--libs'], package='',
                    uselib_store='MYSQL', mandatory=True)
 
+
+    if conf.options.log4cxx:
+        conf.check_cfg(package='liblog4cxx', args=['--cflags', '--libs'], uselib_store='LOG4CXX',
+                       mandatory=True)
+
     boost_libs = 'system random thread filesystem'
 
     if conf.options.with_tests:
@@ -79,7 +87,10 @@
                     " (http://redmine.named-data.net/projects/nfd/wiki/Boost_FAQ)")
         return
 
+    conf.load('coverage')
+
     conf.define('DEFAULT_CONFIG_FILE', '%s/ndn-atmos/catalog.conf' % conf.env['SYSCONFDIR'])
+    conf.define('LOG4CXX_CONFIG_FILE', '%s/ndn-atmos/log4cxx.properties' % conf.env['SYSCONFDIR'])
 
     conf.write_config_header('config.hpp')
 
@@ -90,7 +101,7 @@
         features='cxx',
         source=bld.path.ant_glob(['catalog/src/**/*.cpp'],
                                  excl=['catalog/src/main.cpp']),
-        use='NDN_CXX BOOST JSON MYSQL SYNC',
+        use='NDN_CXX BOOST JSON MYSQL SYNC LOG4CXX',
         includes='catalog/src .',
         export_includes='catalog/src .'
     )
@@ -114,3 +125,10 @@
         target='catalog.conf.sample',
         install_path="${SYSCONFDIR}/ndn-atmos"
     )
+
+    bld(
+        features="subst",
+        source='log4cxx.properties',
+        target='log4cxx.properties',
+        install_path="${SYSCONFDIR}/ndn-atmos"
+    )