Commit 83801cb9 authored by Philippe Coval's avatar Philippe Coval Committed by Ziran Sun

build: Stop logging RD if not wanted

 - Also polish use of LOGGING / TB_LOG option.
 - When using scons CPPDEFINES there is no need to add -D prefix.
 - Add machine readable header in python files (to avoid tabs).

Without this change,
 even if LOGGING is unset, extra verbose log is printed :

  DEBUG: SRM: SRMRegisterHandler !!
  DEBUG: SRM-PSI: GetSecureVirtualDatabaseFromPS IN
  ERROR: SRM-PSI: ps is NULL
  DEBUG: SRM-DOXM: ReadSVDataFromPS failed

This does not occurs in master branch.

Change-Id: Ibfae4ee23b6b157e891e9792c464cd9a00000001
Bug: https://jira.iotivity.org/browse/IOT-1203Signed-off-by: default avatarPhilippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9847Reviewed-by: default avatarGabriel Schulhof <gabriel.schulhof@intel.com>
Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: default avatarZiran Sun <ziran.sun@samsung.com>
parent 02457504
# -*- mode: python; python-indent-offset: 4; indent-tabs-mode: nil -*-
# //******************************************************************
# //
# // Copyright 2015 Intel Mobile Communications GmbH All Rights Reserved.
......@@ -78,13 +79,12 @@ if target_os in ['darwin', 'ios']:
libocsrm_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
libocsrm_env.AppendUnique(LIBS = ['coap'])
if not env.get('RELEASE'):
libocsrm_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
if env.get('DTLS_WITH_X509') == '1':
libocsrm_env.AppendUnique(CPPDEFINES = ['__WITH_X509__'])
libocsrm_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
if libocsrm_env.get('LOGGING'):
libocsrm_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
######################################################################
# Source files and Targets
######################################################################
......
# -*- mode: python; python-indent-offset: 4; indent-tabs-mode: nil -*-
#******************************************************************
#
# Copyright 2015 Samsung Electronics All Rights Reserved.
......@@ -31,7 +32,7 @@ else:
env.AppendUnique(CCFLAGS = ['-g'])
if env.get('LOGGING'):
env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
env.AppendUnique(CPPDEFINES = ['TB_LOG'])
lib_env = env.Clone()
SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment