commit 08d18748fb51c34ec9d240efaac611e2bc71b6b1
author Alexander Afanasyev <aa@cs.fiu.edu> Thu Mar 15 16:31:28 2018 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Thu Mar 15 17:31:29 2018 -0400
tree 28605dfd108fd3568edd5a6fbfc36b3fa80b3a49
parent 55a7cc464e27df10e3be8ecb10645e1040d7312c

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

src/logger.hpp

diff --git a/src/logger.hpp b/src/logger.hpp
index a8999f2..1ed72e0 100644
--- a/src/logger.hpp
+++ b/src/logger.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014, Regents of the University of California.
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California.
  *
  * This file is part of NDNS (Named Data Networking Domain Name Service).
  * See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -20,49 +20,18 @@
 #ifndef NDNS_LOGGER_HPP
 #define NDNS_LOGGER_HPP
 
-#include "config.hpp"
-#include <log4cxx/logger.h>
+#include <ndn-cxx/util/logger.hpp>
 
-namespace ndn {
-namespace ndns {
-namespace log {
+#define NDNS_LOG_INIT(name) NDN_LOG_INIT(ndns.name)
 
-void
-init(const std::string& configFile = DEFAULT_CONFIG_PATH "/" "log4cxx.properties");
+#define NDNS_LOG_FATAL(x) NDN_LOG_FATAL(x)
+#define NDNS_LOG_ERROR(x) NDN_LOG_ERROR(x)
+#define NDNS_LOG_WARN(x)  NDN_LOG_WARN(x)
+#define NDNS_LOG_INFO(x)  NDN_LOG_INFO(x)
+#define NDNS_LOG_DEBUG(x) NDN_LOG_DEBUG(x)
+#define NDNS_LOG_TRACE(x) NDN_LOG_TRACE(x)
 
-// The following has to be pre-processor defines in order to properly determine
-// log locations
-
-#define NDNS_LOG_INIT(name)                                             \
-  static log4cxx::LoggerPtr staticModuleLogger = log4cxx::Logger::getLogger(name);
-
-#define NDNS_LOG_TRACE(x)                       \
-  LOG4CXX_TRACE(staticModuleLogger, x);
-
-#define NDNS_LOG_DEBUG(x)                       \
-  LOG4CXX_DEBUG(staticModuleLogger, x);
-
-#define NDNS_LOG_INFO(x)                        \
-  LOG4CXX_INFO(staticModuleLogger, x);
-
-#define NDNS_LOG_WARN(x)                        \
-  LOG4CXX_WARN(staticModuleLogger, x);
-
-#define NDNS_LOG_ERROR(x)                       \
-  LOG4CXX_ERROR(staticModuleLogger, x);
-
-#define NDNS_LOG_FATAL(x)                       \
-  LOG4CXX_FATAL(staticModuleLogger, x);
-
-#define NDNS_LOG_FUNCTION(x)                                            \
-  LOG4CXX_TRACE(staticModuleLogger, __FUNCTION__ << "(" << x << ")");
-
-#define NDNS_LOG_FUNCTION_NOARGS                                \
-  LOG4CXX_TRACE(staticModuleLogger, __FUNCTION__ << "()");
-
-
-} // namespace log
-} // namespace ndns
-} // namespace ndn
+#define NDNS_LOG_FUNCTION(x)     NDN_LOG_TRACE(__FUNCTION__ << "(" << x << ")")
+#define NDNS_LOG_FUNCTION_NOARGS NDN_LOG_TRACE(__FUNCTION__ << "()")
 
 #endif // NDNS_LOGGER_HPP