#notimgr_env.AppendUnique(CPPPATH = ['../../extlibs/cjson'])
#notimgr_env.AppendUnique(CPPPATH = ['../../resource/csdk/logger/include'])
notimgr_env.PrependUnique(LIBS = [
- 'ResourceClient',
- 'ResourceCache',
- 'ResourceBroker',
- 'ExpiryTimer',
- 'server_builder',
- 'service_common',
+ 'rcs_client',
+ 'rcs_server',
+ 'rcs_common',
'oc',
'octbstack',
'oc_logger',
notimgr_sample_env = notimgr_env.Clone()
notimgr_env.AppendUnique(LIBS = [
'NotificationManager',
- 'ResourceClient',
- 'ResourceCache',
- 'ResourceBroker',
- 'ExpiryTimer',
- 'server_builder',
- 'service_common',
+ 'rcs_client',
+ 'rcs_server',
+ 'rcs_common',
'oc',
'octbstack',
'oc_logger',
# Resource-manipulation build script
######################################################################
import platform
-
Import('env')
SConscript('src/common/SConscript')
-SConscript('src/resourceBroker/SConscript')
-SConscript('src/resourceCache/SConscript')
SConscript('src/serverBuilder/SConscript')
SConscript('src/resourceContainer/SConscript')
######################################################################
-#building Resource client
+#building Resource client, resourceBroker and resourceCache
######################################################################
if env.get('RELEASE'):
resourceClient_env = lib_env.Clone()
target_os = env.get('TARGET_OS')
+
######################################################################
# Build flags
######################################################################
resourceClient_env.AppendUnique(CPPPATH = ['include'])
resourceClient_env.AppendUnique(CPPPATH = ['src/common/primitiveResource/include'])
resourceClient_env.AppendUnique(CPPPATH = ['src/common/expiryTimer/include'])
+resourceClient_env.AppendUnique(CPPPATH = ['src/common/expiryTimer/src'])
resourceClient_env.AppendUnique(CPPPATH = ['src/resourceBroker/include'])
resourceClient_env.AppendUnique(CPPPATH = ['src/resourceCache/include'])
-
-resourceClient_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-
-resourceClient_env.PrependUnique(LIBS = ['oc', 'service_common', 'ResourceBroker' , 'ResourceCache', 'octbstack', 'gnustl_shared','oc_logger', 'compatibility', 'log'])
-
+resourceClient_env.PrependUnique(LIBS = ['oc', 'rcs_common', 'octbstack', 'gnustl_shared','oc_logger', 'compatibility', 'log'])
if target_os not in ['windows', 'winrt']:
resourceClient_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
if target_os == 'linux':
resourceClient_env.AppendUnique(LIBS = ['pthread'])
+
+if target_os == 'android':
+ resourceClient_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
+ resourceClient_env.PrependUnique(LIBS = ['gnustl_shared', 'compatibility', 'log'])
+
+resourceClient_env.AppendUnique(LIBS = ['dl'])
######################################################################
# Source files and Targets
######################################################################
-resourceClient_src = 'src/'
+BROKER_SRC_DIR = 'src/resourceBroker/src/'
+CACHE_SRC_DIR = 'src/resourceCache/src/'
+RESOURCECLIENT_DIR = 'src/'
client_src = [
- resourceClient_src+ 'ResourceClient.cpp']
-ResourceClientsdk = resourceClient_env.StaticLibrary('ResourceClient', client_src)
-resourceClient_env.InstallTarget(ResourceClientsdk , 'libResourceClient')
+ BROKER_SRC_DIR + 'DeviceAssociation.cpp',
+ BROKER_SRC_DIR + 'DevicePresence.cpp',
+ BROKER_SRC_DIR + 'ResourcePresence.cpp',
+ BROKER_SRC_DIR + 'ResourceBroker.cpp',
+ CACHE_SRC_DIR + 'DataCache.cpp',
+ CACHE_SRC_DIR + 'ResourceCacheManager.cpp',
+ RESOURCECLIENT_DIR + 'ResourceClient.cpp'
+ ]
+ResourceClientsdk = resourceClient_env.StaticLibrary('rcs_client', client_src)
+resourceClient_env.InstallTarget(ResourceClientsdk , 'librcs_client')
######################################################################
# Build Sample App: SampleResourceClient & SampleResourceServer
SConscript('examples/SConscript')
######################################################################
-# Build UnitTests Resource Client
+# Build UnitTests Resource Client , resourceCache and resourceBroker
################################################ ######################
-#SConscript('unittests/SConscript')
+SConscript('unittests/SConscript')
+SConscript('src/resourceCache/unittests/SConscript')
+SConscript('src/resourceBroker/unittest/SConscript')
######################################################################
ResourceClient_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
-ResourceClient_env.AppendUnique(LIBS = ['ResourceClient','ResourceCache', 'ResourceBroker', 'ExpiryTimer','service_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'pthread'])
+ResourceClient_env.AppendUnique(LIBS = ['rcs_client', 'rcs_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'pthread'])
ResourceClient_env.AppendUnique(CPPPATH = ['../../include'])
ResourceClient_env.AppendUnique(CPPPATH = ['../../src/resourceBroker/include'])
ResourceClient_env.AppendUnique(CPPPATH = ['../../src/resourceCache/include'])
ResourceClient_env.AppendUnique(CPPPATH = ['../../src/common/primitiveResource/include'])
-
-
######################################################################
# ##### Resource Server #####
######################################################################
ResourceServer_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
-ResourceServer_env.AppendUnique(LIBS = ['libserver_builder', 'libservice_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'pthread'])
+ResourceServer_env.AppendUnique(LIBS = ['rcs_server', 'rcs_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'pthread'])
ResourceServer_env.AppendUnique(CPPPATH = ['../../include'])
ResourceServer_env.AppendUnique(CPPPATH = ['../../src/common/primitiveResource/include'])
ResourceServer_env.AppendUnique(CPPPATH = ['../../src/serverBuilder/include'])
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
\r
##\r
-# basis build script\r
+# rcs_common (primitiveResource and expiryTimer) build script\r
##\r
-import platform\r
-\r
+import os\r
Import('env')\r
\r
-SConscript('primitiveResource/SConscript')\r
-SConscript('expiryTimer/SConscript')\r
+# Add third party libraries\r
+lib_env = env.Clone()\r
+SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', exports = 'lib_env')\r
+\r
+src_dir = lib_env.get('SRC_DIR')\r
+\r
+gtest_dir = src_dir + '/extlibs/gtest/gtest-1.7.0'\r
+\r
+rcs_common_env = lib_env.Clone()\r
+target_os = env.get('TARGET_OS')\r
+\r
+release = env.get('RELEASE')\r
+\r
+######################################################################\r
+# Build flags\r
+######################################################################\r
+rcs_common_env.AppendUnique(CPPPATH = [\r
+ env.get('SRC_DIR')+'/extlibs',\r
+ '../../include',\r
+ 'primitiveResource/include'])\r
+ \r
+rcs_common_env.AppendUnique(CPPPATH = [\r
+ 'expiryTimer/include',\r
+ 'expiryTimer/src'])\r
+\r
+if target_os not in ['windows', 'winrt']:\r
+ rcs_common_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])\r
+ if target_os != 'android':\r
+ rcs_common_env.AppendUnique(CXXFLAGS = ['-pthread'])\r
+\r
+if target_os == 'android':\r
+ rcs_common_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])\r
+ rcs_common_env.PrependUnique(LIBS = ['gnustl_shared', 'compatibility', 'log'])\r
+\r
+rcs_common_env.AppendUnique(LIBS = ['dl'])\r
+\r
+if not release:\r
+ rcs_common_env.AppendUnique(CXXFLAGS = ['--coverage'])\r
+ rcs_common_env.PrependUnique(LIBS = ['gcov'])\r
+\r
+######################################################################\r
+# Source files and Targets\r
+######################################################################\r
+TIMER_SRC_DIR = 'expiryTimer/src/'\r
+RESOURCE_SRC = 'primitiveResource/src/'\r
+rcs_common_src = [\r
+ TIMER_SRC_DIR + 'ExpiryTimerImpl.cpp', \r
+ TIMER_SRC_DIR + 'ExpiryTimer.cpp',\r
+ RESOURCE_SRC + 'PresenceSubscriber.cpp',\r
+ RESOURCE_SRC + 'PrimitiveResource.cpp',\r
+ RESOURCE_SRC + 'RCSException.cpp',\r
+ RESOURCE_SRC + 'RCSAddress.cpp',\r
+ RESOURCE_SRC + 'ResourceAttributes.cpp',\r
+ RESOURCE_SRC + 'ResponseStatement.cpp'\r
+ ]\r
+ \r
+rcs_common_static = rcs_common_env.StaticLibrary('rcs_common', rcs_common_src)\r
+rcs_common_shared = rcs_common_env.SharedLibrary('rcs_common', rcs_common_src)\r
+rcs_common_env.InstallTarget([rcs_common_static,rcs_common_shared], 'rcs_common')\r
+\r
+######################################################################\r
+# Build Test primitive Resource\r
+######################################################################\r
+rcs_common_test_env = rcs_common_env.Clone();\r
+\r
+rcs_common_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])\r
+rcs_common_test_env.PrependUnique(CPPPATH = [\r
+ env.get('SRC_DIR')+'/extlibs/hippomocks-master',\r
+ gtest_dir + '/include',\r
+ 'utils/include'\r
+ ])\r
+\r
+gtest = File(gtest_dir + '/lib/.libs/libgtest.a')\r
+gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')\r
+\r
+rcs_common_test_env.PrependUnique(LIBS = [\r
+ 'oc',\r
+ 'octbstack',\r
+ 'oc_logger',\r
+ 'connectivity_abstraction',\r
+ 'coap',\r
+ 'rcs_common',\r
+ gtest,\r
+ gtest_main,\r
+ 'pthread'\r
+ ])\r
\r
+rcs_common_test_src = env.Glob('primitiveResource/unittests/*.cpp')\r
\r
+rcs_common_test = rcs_common_test_env.Program('rcs_common_test', rcs_common_test_src)\r
+Alias("rcs_common_test", rcs_common_test)\r
+env.AppendTarget('rcs_common_test')
\ No newline at end of file
+++ /dev/null
-#******************************************************************
-#
-# Copyright 2015 Samsung Electronics All Rights Reserved.
-#
-#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-##
-# ResourceCache build script
-##
-
-Import('env')
-
-if env.get('RELEASE'):
- env.AppendUnique(CCFLAGS = ['-Os'])
- env.AppendUnique(CPPDEFINES = ['NDEBUG'])
-else:
- env.AppendUnique(CCFLAGS = ['-g'])
-
-if env.get('LOGGING'):
- env.AppendUnique(CPPDEFINES = ['TB_LOG'])
-
-lib_env = env.Clone()
-SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
-timer_env = lib_env.Clone()
-
-target_os = env.get('TARGET_OS')
-######################################################################
-# Build flags
-######################################################################
-timer_env.AppendUnique(CPPPATH = ['include'])
-timer_env.AppendUnique(CPPPATH = ['src'])
-timer_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap'])
-
-if target_os not in ['windows', 'winrt']:
- timer_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
-
-if target_os == 'linux':
- timer_env.AppendUnique(LIBS = ['pthread'])
-
-######################################################################
-# Source files and Targets
-######################################################################
-TIMER_SRC_DIR = 'src/'
-timer_src = [
- TIMER_SRC_DIR + 'ExpiryTimerImpl.cpp', TIMER_SRC_DIR + 'ExpiryTimer.cpp'
- ]
-
-if target_os in ['tizen','android'] :
- timersdk = timer_env.SharedLibrary('ExpiryTimer', timer_src)
-else :
- timersdk = timer_env.StaticLibrary('ExpiryTimer', timer_src)
-
-timer_env.InstallTarget(timersdk, 'libExpiryTimer')
-
-# Go to build sample apps
-#SConscript('SampleApp/SConscript')
-
+++ /dev/null
-#******************************************************************
-#
-# Copyright 2015 Samsung Electronics All Rights Reserved.
-#
-#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-##
-# things_manager project build script
-##
-import os
-Import('env')
-
-# Add third party libraries
-lib_env = env.Clone()
-SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', exports = 'lib_env')
-
-src_dir = lib_env.get('SRC_DIR')
-
-gtest_dir = src_dir + '/extlibs/gtest/gtest-1.7.0'
-
-service_common_env = lib_env.Clone()
-target_os = env.get('TARGET_OS')
-
-release = env.get('RELEASE')
-
-######################################################################
-# Build flags
-######################################################################
-service_common_env.AppendUnique(CPPPATH = [
- env.get('SRC_DIR')+'/extlibs',
- '../../../include',
- 'include'])
-
-if target_os not in ['windows', 'winrt']:
- service_common_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
- if target_os != 'android':
- service_common_env.AppendUnique(CXXFLAGS = ['-pthread'])
-
-if target_os == 'android':
- service_common_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
- service_common_env.PrependUnique(LIBS = ['gnustl_shared', 'compatibility', 'log'])
-
-service_common_env.AppendUnique(LIBS = ['dl'])
-
-if not release:
- service_common_env.AppendUnique(CXXFLAGS = ['--coverage'])
- service_common_env.PrependUnique(LIBS = ['gcov'])
-
-######################################################################
-# Source files and Targets
-######################################################################
-service_common_src = env.Glob('src/*.cpp')
-service_common_static = service_common_env.StaticLibrary('service_common', service_common_src)
-service_common_shared = service_common_env.SharedLibrary('service_common', service_common_src)
-
-service_common_env.InstallTarget([service_common_static,service_common_shared], 'service_common')
-
-######################################################################
-# Build Test
-######################################################################
-service_common_test_env = service_common_env.Clone();
-
-service_common_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-service_common_test_env.PrependUnique(CPPPATH = [
- env.get('SRC_DIR')+'/extlibs/hippomocks-master',
- gtest_dir + '/include',
- '../utils/include'
- ])
-
-gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
-gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
-
-service_common_test_env.PrependUnique(LIBS = [
- 'oc',
- 'octbstack',
- 'oc_logger',
- 'connectivity_abstraction',
- 'coap',
- 'service_common',
- gtest,
- gtest_main,
- 'pthread'
- ])
-
-service_common_test_src = env.Glob('unittests/*.cpp')
-
-service_common_test = service_common_test_env.Program('service_common_test', service_common_test_src)
-Alias("service_common_test", service_common_test)
-env.AppendTarget('service_common_test')
+++ /dev/null
-#******************************************************************
-#
-# Copyright 2015 Samsung Electronics All Rights Reserved.
-#
-#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-##
-# ResourceBroker build script
-##
-
-Import('env')
-
-if env.get('RELEASE'):
- env.AppendUnique(CCFLAGS = ['-Os'])
- env.AppendUnique(CPPDEFINES = ['NDEBUG'])
-else:
- env.AppendUnique(CCFLAGS = ['-g'])
-
-if env.get('LOGGING'):
- env.AppendUnique(CPPDEFINES = ['TB_LOG'])
-
-lib_env = env.Clone()
-SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
-######################### unit test setting ##########################
-src_dir = lib_env.get('SRC_DIR')
-gtest_dir = src_dir + '/extlibs/gtest/gtest-1.7.0'
-######################################################################
-resourcebroker_env = lib_env.Clone()
-
-target_os = env.get('TARGET_OS')
-######################################################################
-# Build flags
-######################################################################
-resourcebroker_env.AppendUnique(CPPPATH = ['include'])
-resourcebroker_env.AppendUnique(CPPPATH = ['../../include'])
-resourcebroker_env.AppendUnique(CPPPATH = ['../common/primitiveResource/include'])
-resourcebroker_env.AppendUnique(CPPPATH = ['../common/expiryTimer/include'])
-resourcebroker_env.AppendUnique(CPPPATH = ['../common/expiryTimer/src'])
-resourcebroker_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-resourcebroker_env.PrependUnique(LIBS = ['service_common', 'ExpiryTimer', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap'])
-
-
-if target_os not in ['windows', 'winrt']:
- resourcebroker_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
-
-if target_os == 'linux':
- resourcebroker_env.AppendUnique(LIBS = ['pthread'])
-
-######################################################################
-# Source files and Targets
-######################################################################
-BROKER_SRC_DIR = 'src/'
-resourcebroker_src = [
- BROKER_SRC_DIR + 'DeviceAssociation.cpp',
- BROKER_SRC_DIR + 'DevicePresence.cpp',
- BROKER_SRC_DIR + 'ResourcePresence.cpp',
- BROKER_SRC_DIR + 'ResourceBroker.cpp'
- ]
-
-
-if target_os in ['tizen','android'] :
- resourcebrokersdk = resourcebroker_env.SharedLibrary('ResourceBroker', resourcebroker_src)
-else :
- resourcebrokersdk = resourcebroker_env.StaticLibrary('ResourceBroker', resourcebroker_src)
-
-resourcebroker_env.InstallTarget(resourcebrokersdk, 'libResouceBroker')
-resourcebroker_env.UserInstallTargetLib(resourcebrokersdk, 'libResouceBroker')
-######################################################################
-# Build Test
-######################################################################
-
-broker_test_env = resourcebroker_env.Clone();
-
-broker_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-broker_test_env.AppendUnique(CCFLAGS = ['-Wnoexcept'])
-broker_test_env.PrependUnique(CPPPATH = [
- env.get('SRC_DIR')+'/extlibs/hippomocks-master',
- gtest_dir + '/include'
- ])
-
-gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
-gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
-
-broker_test_env.PrependUnique(LIBS = [
- 'oc',
- 'octbstack',
- 'oc_logger',
- 'connectivity_abstraction',
- 'coap',
- 'service_common',
- 'pthread',
- 'ResourceBroker',
- 'ExpiryTimer',
- gtest,
- gtest_main
- ])
-
-broker_test_src = env.Glob('unittest/*.cpp')
-broker_test = broker_test_env.Program('broker_test', broker_test_src)
-Alias("broker_test", broker_test)
-env.AppendTarget('broker_test')
-
-######################################################################
-# Go to build sample apps
-#SConscript('SampleApp/SConscript')
-
-
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
##
-# ResourceCache build script
+# ResourceBroker Unit Test build script
##
Import('env')
lib_env = env.Clone()
SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
-resourcecache_env = lib_env.Clone()
+######################################################################
+#unit test setting
+######################################################################
+src_dir = lib_env.get('SRC_DIR')
+gtest_dir = src_dir + '/extlibs/gtest/gtest-1.7.0'
+
+broker_test_env = lib_env.Clone()
target_os = env.get('TARGET_OS')
######################################################################
# Build flags
######################################################################
-
-resourcecache_env.AppendUnique(CPPPATH = ['include'])
-resourcecache_env.AppendUnique(CPPPATH = ['../../include'])
-resourcecache_env.AppendUnique(CPPPATH = ['../common/primitiveResource/include'])
-resourcecache_env.AppendUnique(CPPPATH = ['../common/expiryTimer/include'])
-resourcecache_env.AppendUnique(CPPPATH = ['../common/expiryTimer/src'])
-resourcecache_env.PrependUnique(LIBS = ['service_common', 'ExpiryTimer', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap'])
-
+gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
+gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
+
+broker_test_env.AppendUnique(CPPPATH = ['../include'])
+broker_test_env.AppendUnique(CPPPATH = ['../../../include'])
+broker_test_env.AppendUnique(CPPPATH = ['../../common/primitiveResource/include'])
+broker_test_env.AppendUnique(CPPPATH = ['../../common/expiryTimer/include'])
+broker_test_env.AppendUnique(CPPPATH = ['../../common/expiryTimer/src'])
+broker_test_env.PrependUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs/hippomocks-master',
+ gtest_dir + '/include'])
+broker_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+broker_test_env.PrependUnique(LIBS = ['rcs_client','rcs_common', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap', gtest, gtest_main])
if target_os not in ['windows', 'winrt']:
- resourcecache_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
+ broker_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
if target_os == 'linux':
- resourcecache_env.AppendUnique(LIBS = ['pthread'])
+ broker_test_env.AppendUnique(LIBS = ['pthread'])
######################################################################
-# Source files and Targets
+# Build Test
######################################################################
-CACHE_SRC_DIR = 'src/'
-resourcecache_src = [
- CACHE_SRC_DIR + 'DataCache.cpp',
- CACHE_SRC_DIR + 'ResourceCacheManager.cpp'
- ]
-
-resourcecachesdk = resourcecache_env.StaticLibrary('ResourceCache', resourcecache_src)
-
-resourcecache_env.InstallTarget(resourcecachesdk, 'libResouceCache')
-resourcecache_env.UserInstallTargetLib(resourcecachesdk, 'libResouceCache')
-# Go to build sample apps
-#SConscript('SampleApp/SConscript')
+broker_test_src = env.Glob('./*.cpp')
+broker_test = broker_test_env.Program('broker_test', broker_test_src)
+Alias("broker_test", broker_test)
+env.AppendTarget('broker_test')
-# Go to Unit Test
-SConscript('unittests/SConscript')
lib_env = env.Clone()
SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
-######################### unit test setting ##########################
+######################################################################
+# unit test setting
+######################################################################
src_dir = lib_env.get('SRC_DIR')
gtest_dir = src_dir + '/extlibs/gtest/gtest-1.7.0'
-######################################################################
cache_test_env = lib_env.Clone()
-
target_os = env.get('TARGET_OS')
######################################################################
cache_test_env.PrependUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs/hippomocks-master',
gtest_dir + '/include'])
cache_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-cache_test_env.PrependUnique(LIBS = ['ResourceCache', 'service_common', 'ExpiryTimer', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', gtest, gtest_main])
-
+cache_test_env.PrependUnique(LIBS = ['rcs_client', 'rcs_common', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', gtest, gtest_main])
if target_os not in ['windows', 'winrt']:
cache_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
######################################################################
# Build Test
######################################################################
-
-
cache_test_src = env.Glob('./*.cpp')
-
cache_test = cache_test_env.Program('cache_test', cache_test_src)
Alias("cache_test", cache_test)
env.AppendTarget('cache_test')
print ''
-resource_container_env.PrependUnique(LIBS = ['server_builder', 'service_common', 'oc','octbstack', 'oc_logger', 'oc_logger_core', 'connectivity_abstraction'])
+resource_container_env.PrependUnique(LIBS = ['rcs_server', 'rcs_common', 'oc','octbstack', 'oc_logger', 'oc_logger_core', 'connectivity_abstraction'])
resource_container_env.AppendUnique(LIBS = ['dl'])
try:
'src/ProtocolBridgeConnector.cpp', 'src/ResourceContainer.cpp', 'src/ResourceContainerBundleAPI.cpp', 'src/ResourceContainerImpl.cpp',
'src/SoftSensorResource.cpp']
-res_container_static = resource_container_env.StaticLibrary('ResContainerLib', res_container_src)
-res_container_shared = resource_container_env.SharedLibrary('ResContainerLib', res_container_src)
+res_container_static = resource_container_env.StaticLibrary('rcs_container', res_container_src)
+res_container_shared = resource_container_env.SharedLibrary('rcs_container', res_container_src)
resource_container_env.InstallTarget([res_container_static,res_container_shared], 'libResContainer')
'../../include',
])
-ss_resource_bundle_env.PrependUnique(LIBS = ['ResContainerLib'])
+ss_resource_bundle_env.PrependUnique(LIBS = ['rcs_container'])
ss_resource_bundle_src = [ Glob(SS_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
'include/'
])
- hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'ResContainerLib'])
+ hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container'])
hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
Command("examples/ResourceContainerConfig.xml","examples/ResourceContainerConfig.xml", Copy("$TARGET", "$SOURCE"))
Ignore("examples/ResourceContainerConfig.xml", "examples/ResourceContainerConfig.xml")
-containersample_env.AppendUnique(LIBS = ['ResContainerLib'])
+containersample_env.AppendUnique(LIBS = ['rcs_container'])
containersampleapp_src = ['src/ContainerSample.cpp']
containersampleapp = containersample_env.Program('ContainerSample',containersampleapp_src)
######################################################################
containersampleclient_env = resource_container_env.Clone();
-containersample_env.AppendUnique(LIBS = ['ResContainerLib'])
+containersample_env.AppendUnique(LIBS = ['rcs_container'])
containersampleclient_src = ['src/ContainerSampleClient.cpp']
containersampleclientapp = containersample_env.Program('ContainerSampleClient',containersampleclient_src)
Alias("containersampleclient", containersampleclientapp)
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
##
-# ResourceContainer Unit Test build script
+# ResourceContainer (rcs_container) Unit Test build script
##
import os
Import('env')
container_gtest_env.AppendUnique(CCFLAGS = ['-Wnoexcept'])
-
-
-container_gtest_env.PrependUnique(LIBS = ['ResContainerLib', 'server_builder', 'service_common', 'oc','octbstack', 'oc_logger', 'oc_logger_core', 'connectivity_abstraction', gtest, gtest_main])
+container_gtest_env.PrependUnique(LIBS = ['rcs_container', 'rcs_server', 'rcs_common', 'oc','octbstack', 'oc_logger', 'oc_logger_core', 'connectivity_abstraction', gtest, gtest_main])
container_gtest_env.AppendUnique(LIBS = ['dl'])
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
##
-# server_builder project build script
+# rcs_server (Server Builder) project build script
##
import os
Import('env')
######################################################################
server_builder_src = env.Glob('src/*.cpp')
-server_builder_static = server_builder_env.StaticLibrary('server_builder', server_builder_src)
-server_builder_shared = server_builder_env.SharedLibrary('server_builder', server_builder_src)
+server_builder_static = server_builder_env.StaticLibrary('rcs_server', server_builder_src)
+server_builder_shared = server_builder_env.SharedLibrary('rcs_server', server_builder_src)
-server_builder_env.InstallTarget([server_builder_static, server_builder_shared], 'server_builder')
+server_builder_env.InstallTarget([server_builder_static, server_builder_shared], 'rcs_server')
######################################################################
# Build Test
gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
server_builder_test_env.PrependUnique(LIBS = [
- 'server_builder',
- 'service_common',
+ 'rcs_server',
+ 'rcs_common',
+ 'pthread',
'oc',
'octbstack',
'oc_logger',
destroyResource();
}
-//Get remote attributes when callback is not NULL
+//Get remote attributes when callback is valid
TEST(ResourceClientTest, testGetRemoteAttributesPass)
{
createResource();
destroyResource();
}
-//Set remote attributes when callback is not NULL
+//Set remote attributes when callback is valid
TEST(ResourceClientTest, testSetRemoteAttributesPass)
{
createResource();
destroyResource();
}
-//Check value of isWatching
-TEST(ResourceClientTest, testIsWatching)
+//Check value of isMonitoring
+TEST(ResourceClientTest, testIsMonitoring)
{
createResource();
manager->DiscoveryManager::discoverResource("", uri, CT_DEFAULT, &onResourceDiscoveredCallback);
sleep(1);
destroyResource();
- EXPECT_FALSE(object->isWatching());
+ EXPECT_FALSE(object->isMonitoring());
}
//Check value of isCaching
EXPECT_TRUE(object->isObservable());
}
-//Check value of startWatching for NULL callback
-TEST(ResourceClientTest, testStartWatchingFail)
+//Check value of startMonitoring for NULL callback
+TEST(ResourceClientTest, testStartMonitoringFail)
{
createResource();
- object->m_watchingFlag = false;
+ object->m_monitoringFlag = false;
object->startMonitoring(NULL);
- EXPECT_TRUE(object->m_watchingFlag);
+ EXPECT_TRUE(object->m_monitoringFlag);
object->stopMonitoring();
destroyResource();
}
-//Check value of startWatching for non NULL callback
-TEST(ResourceClientTest, testStartWatchingPass)
+//Check value of startMonitoring for valid callback
+TEST(ResourceClientTest, testStartMonitoringPass)
{
createResource();
object->startMonitoring(&onResourceStateChanged);
- EXPECT_TRUE(object->m_watchingFlag);
+ EXPECT_TRUE(object->m_monitoringFlag);
object->stopMonitoring();
destroyResource();
}
-//Stop watching when watching is true
-TEST(ResourceClientTest, testStopWatching)
+//Stop Monitoring when Monitoring is true
+TEST(ResourceClientTest, testStopMonitoring)
{
createResource();
object->startMonitoring(&onResourceStateChanged);
object->stopMonitoring();
- EXPECT_FALSE(object->m_watchingFlag);
+ EXPECT_FALSE(object->m_monitoringFlag);
object->startMonitoring(&onResourceStateChanged);
destroyResource();
}
{
createResource();
ResourceState result = object->getState();
- EXPECT_TRUE(result >= ResourceState::NOT_WATCHING && result <= ResourceState::DESTROYED);
+ EXPECT_TRUE(result >= ResourceState::NOT_MONITORING && result <= ResourceState::DESTROYED);
destroyResource();
}
destroyResource();
}
-//Callback for start caching is not NULL
+//Callback for start caching is valid
TEST(ResourceClientTest, testStartCachingCbPass)
{
createResource();
ResourceClient_gtest_env.PrependUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs/hippomocks-master/HippoMocks', gtest_dir + '/include'])
ResourceClient_gtest_env.AppendUnique(LIBPATH = ['/usr/lib/jvm/jdk1.8.0_40/jre/lib/amd64/server/'])
-ResourceClient_gtest_env.PrependUnique(LIBS = ['ResourceClient','ResourceCache', 'ResourceBroker', 'ExpiryTimer','server_builder', 'service_common', 'oc','octbstack', 'oc_logger', 'oc_logger_core', 'connectivity_abstraction', gtest, gtest_main])
+ResourceClient_gtest_env.PrependUnique(LIBS = ['rcs_client','rcs_server', 'rcs_common', 'oc','octbstack', 'oc_logger', 'oc_logger_core', 'connectivity_abstraction', gtest, gtest_main])
ResourceClient_gtest_env.AppendUnique(LIBS = ['dl'])
######################################################################
projects / contrib / iotivity.git / commitdiff