Remove shared resource directory library usage from other modules

All the added code for the resource directory shared library dependency on library oc.

https://jira.iotivity.org/browse/IOT-1510

Change-Id: Ic8710588bf0a044e8b29283dc36a411c1928b6ae
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14225
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

diff --git a/build_common/external_libs.scons b/build_common/external_libs.scons
index 645188a..021df2a 100644 (file)
--- a/build_common/external_libs.scons
+++ b/build_common/external_libs.scons
@@ -145,5 +145,5 @@ if env.get('SECURED') == '1' and target_os not in ['linux', 'tizen']:
        SConscript(os.path.join(env.get('SRC_DIR'), 'extlibs', 'sqlite3', 'SConscript'))
 
 if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-        if target_os not in ['linux', 'tizen']:
-                SConscript(os.path.join(env.get('SRC_DIR'), 'extlibs', 'sqlite3', 'SConscript'))
+       if target_os not in ['linux', 'tizen']:
+               SConscript('#extlibs/sqlite3/SConscript')

diff --git a/examples/OICMiddle/SConscript b/examples/OICMiddle/SConscript
index b2b981b..95a09f2 100644 (file)
--- a/examples/OICMiddle/SConscript
+++ b/examples/OICMiddle/SConscript
@@ -27,8 +27,6 @@ lib_env = env.Clone()
 SConscript('#resource/third_party_libs.scons', 'lib_env')
 
 examples_env = lib_env.Clone()
-rd_mode = lib_env.get('RD_MODE')
-
 ######################################################################
 # Build flags
 ######################################################################
@@ -73,9 +71,6 @@ if target_os in ['darwin', 'ios']:
 if env.get('WITH_CLOUD'):
        examples_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       examples_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Source files and Targets
 ######################################################################

diff --git a/resource/examples/SConscript b/resource/examples/SConscript
index 84332c2..57d989b 100644 (file)
--- a/resource/examples/SConscript
+++ b/resource/examples/SConscript
@@ -28,7 +28,6 @@ lib_env = thread_env.Clone()
 SConscript('#resource/third_party_libs.scons', 'lib_env')
 examples_env = lib_env.Clone()
 target_os = examples_env.get('TARGET_OS')
-rd_mode = examples_env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -38,7 +37,7 @@ examples_env.AppendUnique(CPPPATH = [
                '../csdk/stack/include',
                '../c_common/ocrandom/include',
                '../csdk/logger/include',
-               '../oc_logger/include'
+               '../oc_logger/include',
                ])
 
 examples_env.AppendUnique(LIBPATH = [examples_env.get('BUILD_DIR')])
@@ -81,9 +80,6 @@ if target_os in ['msys_nt', 'windows']:
 if examples_env.get('LOGGING'):
        examples_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       examples_env.AppendUnique(LIBS = ['resource_directory'])
-
 def make_single_file_cpp_program(program_name):
        return examples_env.Program(program_name, program_name + ".cpp")
 

diff --git a/resource/provisioning/unittests/SConscript b/resource/provisioning/unittests/SConscript
index 70f1a63..c7a4561 100755 (executable)
--- a/resource/provisioning/unittests/SConscript
+++ b/resource/provisioning/unittests/SConscript
@@ -28,7 +28,6 @@ src_dir = provisiontests_env.get('SRC_DIR')
 target_os = provisiontests_env.get('TARGET_OS')
 with_ra = provisiontests_env.get('WITH_RA')
 with_ra_ibb = provisiontests_env.get('WITH_RA_IBB')
-rd_mode = provisiontests_env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -82,9 +81,6 @@ if provisiontests_env.get('SECURED') == '1':
 if provisiontests_env.get('LOGGING'):
        provisiontests_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       provisiontests_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Source files and Targets
 ######################################################################

diff --git a/resource/unittests/SConscript b/resource/unittests/SConscript
index 5b522ff..afaaeff 100644 (file)
--- a/resource/unittests/SConscript
+++ b/resource/unittests/SConscript
@@ -27,7 +27,6 @@ unittests_env = gtest_env.Clone()
 src_dir = unittests_env.get('SRC_DIR')
 target_os = unittests_env.get('TARGET_OS')
 with_mq = unittests_env.get('WITH_MQ')
-rd_mode = unittests_env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -73,9 +72,6 @@ if unittests_env.get('LOGGING'):
 if unittests_env.get('WITH_CLOUD'):
        unittests_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       unittests_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Source files and Targets
 ######################################################################

diff --git a/service/easy-setup/enrollee/unittests/SConscript b/service/easy-setup/enrollee/unittests/SConscript
index d64bcd8..399cb12 100644 (file)
--- a/service/easy-setup/enrollee/unittests/SConscript
+++ b/service/easy-setup/enrollee/unittests/SConscript
@@ -34,7 +34,6 @@ if env.get('LOGGING'):
        env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 lib_env = env.Clone()
-rd_mode = env.get('RD_MODE')
 
 SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 
@@ -76,12 +75,6 @@ if easysetup_test_env.get('SECURED') == '1':
        if easysetup_test_env.get('WITH_TCP') == True:
                easysetup_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-    if 'CLIENT' in rd_mode:
-        easysetup_test_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
-    if 'SERVER' in rd_mode:
-        easysetup_test_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
-    easysetup_test_env.AppendUnique(LIBS = ['resource_directory'])
 ######################################################################
 # Build Test
 ######################################################################

diff --git a/service/easy-setup/mediator/richsdk/unittests/SConscript b/service/easy-setup/mediator/richsdk/unittests/SConscript
index 5d86303..986ace1 100644 (file)
--- a/service/easy-setup/mediator/richsdk/unittests/SConscript
+++ b/service/easy-setup/mediator/richsdk/unittests/SConscript
@@ -44,7 +44,6 @@ gtest_dir = src_dir + '/extlibs/gtest/gtest-1.7.0'
 
 easysetup_test_env = lib_env.Clone()
 target_os = env.get('TARGET_OS')
-rd_mode = env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -74,14 +73,6 @@ easysetup_test_env.AppendUnique(CPPPATH = [ src_dir + '/resource/include',
 if env.get('SECURED') == '1':
        if env.get('WITH_TCP') == True:
                easysetup_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
-
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-    if 'CLIENT' in rd_mode:
-        easysetup_test_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
-    if 'SERVER' in rd_mode:
-        easysetup_test_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
-    easysetup_test_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Build Test
 ######################################################################

diff --git a/service/easy-setup/sampleapp/enrollee/linux/SConscript b/service/easy-setup/sampleapp/enrollee/linux/SConscript
index c024a96..8918906 100644 (file)
--- a/service/easy-setup/sampleapp/enrollee/linux/SConscript
+++ b/service/easy-setup/sampleapp/enrollee/linux/SConscript
@@ -28,7 +28,6 @@ print Dir('.').abspath
 
 enrollee_env = env.Clone()
 transport = enrollee_env.get('TARGET_TRANSPORT')
-rd_mode = env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -62,9 +61,6 @@ if enrollee_env.get('SECURED') == '1':
        if enrollee_env.get('WITH_TCP') == True:
                enrollee_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       enrollee_env.AppendUnique(LIBS = ['resource_directory'])
-
 enrollee = enrollee_env.Program('enrollee', ['enrolleewifi.c', 'easysetup_x.c'])
 
 i_enrollee = enrollee_env.Install(env.get('BUILD_DIR'), enrollee)

diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
index a226aff..2f422a2 100644 (file)
--- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
+++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
@@ -23,7 +23,6 @@ Import('env')
 mediator_env = env.Clone()
 
 target_os = env.get('TARGET_OS')
-rd_mode = env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -44,9 +43,6 @@ env.AppendUnique(CPPDEFINES = ['CPP_MEDIATOR'])
 if target_os not in ['windows']:
     mediator_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-    mediator_env.AppendUnique(LIBS = ['resource_directory'])
-
 mediator_env.PrependUnique(CPPPATH = [
             env.get('SRC_DIR') + '/resource/include',
             env.get('SRC_DIR') + '/resource/oc_logger/include',

diff --git a/service/notification/SConscript b/service/notification/SConscript
index b1177a2..d467ccb 100755 (executable)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -81,9 +81,6 @@ if target_os == 'tizen':
        notification_env.AppendUnique(CPPDEFINES = ['__TIZEN__'])
        # notification_env.ParseConfig('pkg-config --cflags --libs sqlite3')
 
-if 'CLIENT' in notification_env.get('RD_MODE'):
-       notification_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
-
 if env.get('WITH_CLOUD') == True:
        notification_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])
 

diff --git a/service/notification/cpp-wrapper/examples/linux/SConscript b/service/notification/cpp-wrapper/examples/linux/SConscript
index cf509cb..bff7f1c 100755 (executable)
--- a/service/notification/cpp-wrapper/examples/linux/SConscript
+++ b/service/notification/cpp-wrapper/examples/linux/SConscript
@@ -28,7 +28,6 @@ lib_env = env.Clone()
 SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 notification_sample_env = lib_env.Clone()
 
-rd_mode = env.get('RD_MODE')
 target_os = env.get('TARGET_OS')
 ######################################################################
 # Build flags
@@ -75,13 +74,6 @@ if env.get('WITH_TCP') == True:
        if env.get('SECURED') == '1':
                notification_sample_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-    if 'CLIENT' in rd_mode:
-        notification_sample_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
-    if 'SERVER' in rd_mode:
-        notification_sample_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
-    notification_sample_env.AppendUnique(LIBS = ['resource_directory'])
-
 ####################################################################
 # Source files and Targets
 ######################################################################

diff --git a/service/notification/cpp-wrapper/unittest/SConscript b/service/notification/cpp-wrapper/unittest/SConscript
index f6d20de..af0b2a5 100644 (file)
--- a/service/notification/cpp-wrapper/unittest/SConscript
+++ b/service/notification/cpp-wrapper/unittest/SConscript
@@ -34,7 +34,6 @@ if env.get('LOGGING'):
        env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 lib_env = env.Clone()
-rd_mode = env.get('RD_MODE')
 SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 
 ######################################################################
@@ -62,13 +61,6 @@ if env.get('WITH_TCP') == True:
        if env.get('SECURED') == '1':
                notification_wrapper_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-    if 'CLIENT' in rd_mode:
-        notification_wrapper_test_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
-    if 'SERVER' in rd_mode:
-        notification_wrapper_test_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
-    notification_wrapper_test_env.AppendUnique(LIBS = ['resource_directory'])
-
 if target_os not in ['windows', 'winrt']:
     notification_wrapper_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
 

diff --git a/service/notification/examples/linux/SConscript b/service/notification/examples/linux/SConscript
index de1a2ab..826e60f 100644 (file)
--- a/service/notification/examples/linux/SConscript
+++ b/service/notification/examples/linux/SConscript
@@ -9,7 +9,6 @@ SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 notification_sample_env = lib_env.Clone()
 
 target_os = env.get('TARGET_OS')
-rd_mode = env.get('RD_MODE')
 ######################################################################
 # Build flags
 ######################################################################
@@ -66,9 +65,6 @@ if env.get('WITH_TCP') == True:
        if env.get('SECURED') == '1':
                notification_sample_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       notification_sample_env.AppendUnique(LIBS = ['resource_directory'])
-
 ####################################################################
 # Source files and Targets
 ######################################################################

diff --git a/service/notification/unittest/SConscript b/service/notification/unittest/SConscript
index b717b77..a0aae39 100644 (file)
--- a/service/notification/unittest/SConscript
+++ b/service/notification/unittest/SConscript
@@ -34,7 +34,6 @@ if env.get('LOGGING'):
        env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 lib_env = env.Clone()
-rd_mode = env.get('RD_MODE')
 SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 
 ######################################################################
@@ -73,13 +72,6 @@ if env.get('WITH_TCP') == True:
        if env.get('SECURED') == '1':
                notification_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-    if 'CLIENT' in rd_mode:
-        notification_test_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
-    if 'SERVER' in rd_mode:
-        notification_test_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
-    notification_test_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Build Test
 ######################################################################

diff --git a/service/resource-container/SConscript b/service/resource-container/SConscript
index 13cc441..551d054 100644 (file)
--- a/service/resource-container/SConscript
+++ b/service/resource-container/SConscript
@@ -41,8 +41,6 @@ SConscript('#service/third_party_libs.scons', exports = 'lib_env')
 
 resource_container_env = lib_env.Clone()
 target_os = env.get('TARGET_OS')
-rd_mode = env.get('RD_MODE')
-
 ######################################################################
 # Build flags
 ######################################################################
@@ -239,9 +237,6 @@ Ignore("examples/ResourceContainerConfig.xml", "examples/ResourceContainerConfig
 
 containersample_env.AppendUnique(LIBS = ['rcs_container'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       containersample_env.AppendUnique(LIBS = ['resource_directory'])
-
 containersampleapp_src =  ['examples/ContainerSample.cpp']
 containersampleapp = containersample_env.Program('ContainerSample',containersampleapp_src)
 Alias("containersample", containersampleapp)

diff --git a/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript b/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript
index f05ad5b..7548813 100644 (file)
--- a/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript
+++ b/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript
@@ -8,7 +8,6 @@ Import('env')
 lib_env = env.Clone()
 SConscript('#service/third_party_libs.scons', 'lib_env')
 linux_sample_env = lib_env.Clone()
-rd_mode = env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -32,9 +31,6 @@ if env.get('SECURED') == '1':
 if 'rt' in linux_sample_env.get('LIBS'):
     linux_sample_env.Append(LIBS = ['rt'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       linux_sample_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 #build sampleapp
 ######################################################################

diff --git a/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript b/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript
index 96410a7..10cd7d6 100644 (file)
--- a/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript
+++ b/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript
@@ -8,7 +8,6 @@ Import('env')
 lib_env = env.Clone()
 SConscript('#service/third_party_libs.scons', 'lib_env')
 linux_sample_env = lib_env.Clone()
-rd_mode = env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -32,9 +31,6 @@ if env.get('SECURED') == '1':
 if 'rt' in linux_sample_env.get('LIBS'):
     linux_sample_env.Append(LIBS = ['rt'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       linux_sample_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 #build sampleapp
 ######################################################################

diff --git a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript
index 5ac5a87..9cb35f7 100644 (file)
--- a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript
+++ b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript
@@ -8,7 +8,6 @@ Import('env')
 lib_env = env.Clone()
 SConscript('#service/third_party_libs.scons', 'lib_env')
 linux_sample_env = lib_env.Clone()
-rd_mode = env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -32,9 +31,6 @@ if env.get('SECURED') == '1':
 if 'rt' in linux_sample_env.get('LIBS'):
     linux_sample_env.Append(LIBS = ['rt'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       linux_sample_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 #build sampleapp
 ######################################################################

diff --git a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript
index 909db59..7643066 100644 (file)
--- a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript
+++ b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript
@@ -8,7 +8,6 @@ Import('env')
 lib_env = env.Clone()
 SConscript('#service/third_party_libs.scons', 'lib_env')
 linux_sample_env = lib_env.Clone()
-rd_mode = env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -32,9 +31,6 @@ if env.get('SECURED') == '1':
 if 'rt' in linux_sample_env.get('LIBS'):
     linux_sample_env.Append(LIBS = ['rt'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       linux_sample_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 #build sampleapp
 ######################################################################

diff --git a/service/resource-encapsulation/examples/linux/SConscript b/service/resource-encapsulation/examples/linux/SConscript
index c131c13..90fbd58 100644 (file)
--- a/service/resource-encapsulation/examples/linux/SConscript
+++ b/service/resource-encapsulation/examples/linux/SConscript
@@ -28,7 +28,6 @@ lib_env = env.Clone()
 SConscript('#service/third_party_libs.scons', 'lib_env')
 
 sample_env = lib_env.Clone()
-rd_mode = lib_env.get('RD_MODE')
 
 sample_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x'])
 sample_env.AppendUnique(LIBS = [
@@ -48,9 +47,6 @@ if env.get('SECURED') == '1':
 if 'rt' in sample_env.get('LIBS'):
     sample_env.Append(LIBS = ['rt'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       sample_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # ##### Client #####
 ######################################################################

diff --git a/service/resource-encapsulation/examples/linux/secureResourceExample/SConscript b/service/resource-encapsulation/examples/linux/secureResourceExample/SConscript
index 429afec..eed44bf 100644 (file)
--- a/service/resource-encapsulation/examples/linux/secureResourceExample/SConscript
+++ b/service/resource-encapsulation/examples/linux/secureResourceExample/SConscript
@@ -27,7 +27,6 @@ Import('env')
 lib_env = env.Clone()
 SConscript('#service/third_party_libs.scons', 'lib_env')
 sample_env = lib_env.Clone()
-rd_mode = env.get('RD_MODE')
 
 sample_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x'])
 sample_env.AppendUnique(LIBS = [
@@ -49,9 +48,6 @@ if env.get('SECURED') == '1':
 if 'rt' in sample_env.get('LIBS'):
     sample_env.Append(LIBS = ['rt'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       sample_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # ##### Authorized Client #####
 ######################################################################

diff --git a/service/resource-encapsulation/src/common/SConscript b/service/resource-encapsulation/src/common/SConscript
index 9eac4c5..29676dd 100644 (file)
--- a/service/resource-encapsulation/src/common/SConscript
+++ b/service/resource-encapsulation/src/common/SConscript
@@ -33,7 +33,6 @@ rcs_common_env = lib_env.Clone()
 target_os = rcs_common_env.get('TARGET_OS')
 release = rcs_common_env.get('RELEASE')
 src_dir = rcs_common_env.get('SRC_DIR')
-rd_mode = rcs_common_env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -70,9 +69,6 @@ if rcs_common_env.get('SECURED') == '1':
        if rcs_common_env.get('WITH_TCP') == True:
                rcs_common_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       rcs_common_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Source files and Targets
 ######################################################################

diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/SConscript b/service/resource-encapsulation/src/resourceBroker/unittest/SConscript
index 20ec0c2..f6d7e36 100644 (file)
--- a/service/resource-encapsulation/src/resourceBroker/unittest/SConscript
+++ b/service/resource-encapsulation/src/resourceBroker/unittest/SConscript
@@ -24,7 +24,6 @@
 # SConscript file for Local PKI google tests
 gtest_env = SConscript('#extlibs/gtest/SConscript')
 lib_env = gtest_env.Clone()
-rd_mode = lib_env.get('RD_MODE')
 
 if lib_env.get('RELEASE'):
     lib_env.AppendUnique(CCFLAGS = ['-Os'])
@@ -74,9 +73,6 @@ if broker_test_env.get('SECURED') == '1':
        if broker_test_env.get('WITH_TCP') == True:
                broker_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       broker_test_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Build Test
 ######################################################################

diff --git a/service/resource-encapsulation/src/resourceCache/unittests/SConscript b/service/resource-encapsulation/src/resourceCache/unittests/SConscript
index 82bd59e..80ff7c1 100644 (file)
--- a/service/resource-encapsulation/src/resourceCache/unittests/SConscript
+++ b/service/resource-encapsulation/src/resourceCache/unittests/SConscript
@@ -24,7 +24,6 @@
 # SConscript file for Local PKI google tests
 gtest_env = SConscript('#extlibs/gtest/SConscript')
 lib_env = gtest_env.Clone()
-rd_mode = lib_env.get('RD_MODE')
 
 if lib_env.get('RELEASE'):
     lib_env.AppendUnique(CCFLAGS = ['-Os'])
@@ -67,9 +66,6 @@ if cache_test_env.get('SECURED') == '1':
        if cache_test_env.get('WITH_TCP') == True:
                cache_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       cache_test_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Build Test
 ######################################################################

diff --git a/service/resource-encapsulation/unittests/SConscript b/service/resource-encapsulation/unittests/SConscript
index 2ade999..9aad325 100644 (file)
--- a/service/resource-encapsulation/unittests/SConscript
+++ b/service/resource-encapsulation/unittests/SConscript
@@ -25,7 +25,6 @@
 gtest_env = SConscript('#extlibs/gtest/SConscript')
 lib_env = gtest_env.Clone()
 target_os = lib_env.get('TARGET_OS')
-rd_mode = lib_env.get('RD_MODE')
 
 if lib_env.get('RELEASE'):
     lib_env.AppendUnique(CCFLAGS = ['-Os'])
@@ -75,9 +74,6 @@ if lib_env.get('SECURED') == '1':
        if lib_env.get('WITH_TCP') == True:
                rcs_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       rcs_test_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Build Test
 ######################################################################

diff --git a/service/resource-hosting/unittest/SConscript b/service/resource-hosting/unittest/SConscript
index c26720f..bafb93f 100644 (file)
--- a/service/resource-hosting/unittest/SConscript
+++ b/service/resource-hosting/unittest/SConscript
@@ -44,7 +44,6 @@ src_dir = lib_env.get('SRC_DIR')
 
 hosting_test_env = lib_env.Clone()
 target_os = hosting_test_env.get('TARGET_OS')
-rd_mode = lib_env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -68,9 +67,6 @@ if hosting_test_env.get('SECURED') == '1':
        if hosting_test_env.get('WITH_TCP') == True:
                hosting_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       hosting_test_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Build Test
 ######################################################################

diff --git a/service/scene-manager/unittests/SConscript b/service/scene-manager/unittests/SConscript
index f334218..f4cdb47 100644 (file)
--- a/service/scene-manager/unittests/SConscript
+++ b/service/scene-manager/unittests/SConscript
@@ -24,7 +24,6 @@
 # SConscript file for Local PKI google tests
 gtest_env = SConscript('#extlibs/gtest/SConscript')
 lib_env = gtest_env.Clone()
-rd_mode = lib_env.get('RD_MODE')
 
 if lib_env.get('RELEASE'):
     lib_env.AppendUnique(CCFLAGS = ['-Os'])
@@ -44,7 +43,6 @@ src_dir = lib_env.get('SRC_DIR')
 
 scene_test_env = lib_env.Clone()
 target_os = scene_test_env.get('TARGET_OS')
-rd_mode = scene_test_env.get('RD_MODE')
 
 ######################################################################
 # Build flags
@@ -73,9 +71,6 @@ if scene_test_env.get('SECURED') == '1':
        if scene_test_env.get('WITH_TCP') == True:
                scene_test_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-    scene_test_env.PrependUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Build Test
 ######################################################################

diff --git a/service/things-manager/unittests/SConscript b/service/things-manager/unittests/SConscript
index 4c03f27..a657db4 100644 (file)
--- a/service/things-manager/unittests/SConscript
+++ b/service/things-manager/unittests/SConscript
@@ -27,7 +27,6 @@ import os
 gtest_env = SConscript('#extlibs/gtest/SConscript')
 lib_env = gtest_env.Clone()
 target_os = lib_env.get('TARGET_OS')
-rd_mode = lib_env.get('RD_MODE')
 
 if lib_env.get('RELEASE'):
     lib_env.AppendUnique(CCFLAGS = ['-Os'])
@@ -76,9 +75,6 @@ if ThingsManager_gtest_env.get('SECURED') == '1':
        if ThingsManager_gtest_env.get('WITH_TCP') == True:
                ThingsManager_gtest_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-    ThingsManager_gtest_env.AppendUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Build Test
 ######################################################################