'oc',
'connectivity_abstraction',
'coap',
- 'octbstack',
- 'oc_logger',
+ 'octbstack'
])
if elevator_server_env.get('SECURED') == '1':
if target_os in ['msys_nt', 'windows']:
elevator_server_env.AppendUnique(LINKFLAGS = ['/subsystem:CONSOLE'])
+else:
+ elevator_server_env.PrependUnique(LIBS = ['oc_logger'])
######################################################################
# Source files and Targets
'#/extlibs/cjson',
])
-ipca_lib_env.Replace(WINDOWS_INSERT_DEF = ['1'])
+if target_os in ['windows', 'msys_nt']:
+ ipca_lib_env.Replace(WINDOWS_INSERT_DEF = ['1'])
+else:
+ ipca_lib_env.PrependUnique(LIBS = [
+ 'oc_logger'
+ ])
ipca_lib_env.PrependUnique(LIBS = [
'oc',
'connectivity_abstraction',
'coap',
- 'octbstack',
- 'oc_logger'
+ 'octbstack'
])
if ipca_env.get('SECURED') == '1':
])
ipcatest_env.PrependUnique(LIBS = [
- 'oc_logger',
+ 'oc_logger_internal',
'octbstack',
'ipca_static'
])
if 'g++' in provisioning_env.get('CXX'):
provisioning_env.AppendUnique(CXXFLAGS = ['-std=c++0x'])
-provisioning_env.PrependUnique(LIBS = ['octbstack', 'oc_logger', 'connectivity_abstraction', 'coap'])
+provisioning_env.PrependUnique(LIBS = ['octbstack', 'connectivity_abstraction', 'coap'])
if target_os not in ['msys_nt', 'windows']:
# octbstack.dll is exporting ocpmapi and ocsrm APIs on Windows.
else:
provisioning_sample_env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource', 'csdk')])
-provisioning_sample_env.PrependUnique(LIBS = ['oc', 'oc_logger', 'octbstack', 'connectivity_abstraction', 'coap'])
+provisioning_sample_env.PrependUnique(LIBS = ['oc', 'octbstack', 'connectivity_abstraction', 'coap'])
if target_os not in ['msys_nt', 'windows']:
- # octbstack.dll is exporting ocpmapi and ocsrm APIs on Windows.
- provisioning_sample_env.PrependUnique(LIBS = ['ocpmapi', 'ocsrm'])
+ provisioning_sample_env.PrependUnique(LIBS = ['oc_logger', 'ocpmapi', 'ocsrm'])
if env.get('SECURED') == '1':
provisioning_sample_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
-
if env.get('MULTIPLE_OWNER') == '1':
provisioning_sample_env.AppendUnique(CPPDEFINES = ['MULTIPLE_OWNER'])
'../../../connectivity/common/inc',
'../../../connectivity/api'
])
+
sptest_env.PrependUnique(LIBS = [ 'ocpmapi',
'oc',
'octbstack_test',
'ocsrm',
- 'oc_logger',
+ 'oc_logger_internal',
'connectivity_abstraction',
'coap'])
srmtest_env.PrependUnique(LIBS = ['ocsrm',
'octbstack_test',
- 'oc_logger',
+ 'oc_logger_internal',
'connectivity_abstraction',
'coap'])
# octbstack.def specifies the list of functions exported by octbstack.dll.
liboctbstack_env.Replace(WINDOWS_INSERT_DEF = ['1'])
+ # On Windows, apps don't link directly with oc_logger. oc_logger is linked inside
+ # octbstack.dll and apps import its APIs by linking with octbstack.lib.
+ liboctbstack_env.PrependUnique(LIBS = ['oc_logger_internal'])
+
if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
# On Windows:
# - octbstack.dll is exporting resource_directory C APIs
if env.get('SECURED') != '1':
liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_temp2.def')])
else:
- # octbstack.dll is exporting ocpmapi APIs on Windows - there is no ocpmapi.dll.
+ # On Windows, apps don't link directly with ocpmapi.lib. ocpmapi is linked
+ # inside octbstack.dll and apps import its APIs by linking with octbstack.lib.
liboctbstack_env.PrependUnique(LIBS = ['ocpmapi'])
liboctbstack_env.Textfile(target = 'octbstack_temp3.def', source = [File('octbstack_temp2.def'), File('octbstack_product_secured.def')])
OCStopPresence
OCStopMulticastServer
OCUnBindResource
+
+oc_log_destroy
+oc_log_set_level
+oc_log_set_module
+oc_log_write
+oc_make_console_logger
+oc_make_ostream_logger
'connectivity_abstraction',
'coap',
'mbedcrypto'])
-if target_os != 'darwin':
- stacktest_env.PrependUnique(LIBS = ['oc_logger'])
if stacktest_env.get('SECURED') == '1':
stacktest_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509'])
examples_env.AppendUnique(RPATH = [examples_env.get('BUILD_DIR')])
examples_env.PrependUnique(LIBS = ['coap'])
examples_env.AppendUnique(LIBS = ['connectivity_abstraction'])
-examples_env.AppendUnique(LIBS = ['oc_logger'])
examples_env.AppendUnique(LIBS = ['octbstack'])
examples_env.AppendUnique(LIBS = ['oc'])
if target_os in ['msys_nt', 'windows']:
examples_env.PrependUnique(LIBS = ['mswsock', 'ws2_32', 'iphlpapi', 'ole32'])
+else:
+ examples_env.PrependUnique(LIBS = ['oc_logger'])
if examples_env.get('SECURED') == '1':
examples_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto'])
# Source files and Targets
######################################################################
-oc_logger_libs = []
+oc_logger_libs = liboc_logger_env.StaticLibrary('oc_logger_internal',
+ ['c/oc_logger.c', 'c/oc_console_logger.c', 'cpp/oc_ostream_logger.cpp'])
-if target_os in ['windows', 'msys_nt','ios']:
- # If oc_logger APIs have to be exported from a Windows DLL, these functions
- # should be exported from octbstack.dll. Building a separate oc_logger.dll here
- # would result in duplicated code and data across these two DLLs. Using just
- # the static oc_logger.lib is good enough for Windows for now.
+if target_os in ['ios']:
oc_logger_libs += liboc_logger_env.StaticLibrary('oc_logger',
['c/oc_logger.c', 'c/oc_console_logger.c', 'cpp/oc_ostream_logger.cpp'])
-else:
+elif target_os not in ['windows', 'msys_nt']:
oc_logger_libs += Flatten(liboc_logger_env.SharedLibrary('oc_logger_core',
['c/oc_logger.c'], OBJPREFIX='core_'))
oc_logger_libs += Flatten(liboc_logger_env.SharedLibrary('oc_logger',
if target_os not in ['ios', 'android']:
SConscript('examples/SConscript')
-
# Build flags
######################################################################
examples_env.PrependUnique(CPPPATH = ['../include'])
-examples_env.AppendUnique(LIBS = ['oc_logger'])
examples_env.Append(LIBS = ['c_common'])
compiler = env.get('CC')
if compiler != 'cl':
- examples_env.AppendUnique(LIBS = ['stdc++'])
+ examples_env.AppendUnique(LIBS = ['stdc++'])
target_os = env.get('TARGET_OS')
-if target_os == 'android':
- examples_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
- examples_env.AppendUnique(LIBS = ['gnustl_shared'])
-if target_os not in ['arduino', 'windows']:
- examples_env.AppendUnique(CFLAGS = Split('-Wall -std=c99 -Werror'))
- examples_env.AppendUnique(CXXFLAGS = Split('-Wall -std=c++0x'))
+if target_os not in ['arduino', 'msys_nt', 'windows']:
+ examples_env.AppendUnique(CFLAGS = Split('-Wall -std=c99 -Werror'))
+ examples_env.AppendUnique(CXXFLAGS = Split('-Wall -std=c++0x'))
+ examples_env.AppendUnique(LIBS = ['oc_logger'])
+
+ if target_os == 'android':
+ examples_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
+ examples_env.PrependUnique(LIBS = ['gnustl_shared'])
+else:
+ examples_env.AppendUnique(LIBS = ['octbstack'])
######################################################################
# Source files and Targets
Alias('liboc_logger_examples', [examples_c, examples_cpp])
examples_env.AppendTarget('liboc_logger_examples')
-
unittests_env.PrependUnique(LIBS = [
'oc',
'octbstack_test',
- 'oc_logger',
+ 'oc_logger_internal',
'connectivity_abstraction',
'coap',
'mbedcrypto'])