From 5d21a4a9bc5c9365a246e9d6cf9dd5699bbc28b6 Mon Sep 17 00:00:00 2001 From: Dan Mihai Date: Mon, 10 Apr 2017 08:02:30 -0700 Subject: [PATCH] Remove unused dependencies to RD LIB Change-Id: Id40c4b20433ad5e514657495ffac17fee6df61db Signed-off-by: Dan Mihai Reviewed-on: https://gerrit.iotivity.org/gerrit/18773 Tested-by: jenkins-iotivity Reviewed-by: Kevin Kane Reviewed-by: Jaehong Jo Reviewed-by: Todd Malsbary Reviewed-by: Mike Fenelon --- resource/IPCA/samples/ElevatorServer/SConscript | 3 --- resource/IPCA/src/SConscript | 3 --- resource/IPCA/unittests/SConscript | 3 --- resource/csdk/connectivity/test/SConscript | 1 - resource/csdk/security/provisioning/unittest/SConscript | 4 ---- resource/csdk/security/unittest/SConscript | 4 ---- resource/csdk/stack/test/SConscript | 3 --- service/resource-encapsulation/SConscript | 2 +- service/resource-encapsulation/src/serverBuilder/SConscript | 3 --- service/scene-manager/sampleapp/linux/SConscript | 3 --- 10 files changed, 1 insertion(+), 28 deletions(-) diff --git a/resource/IPCA/samples/ElevatorServer/SConscript b/resource/IPCA/samples/ElevatorServer/SConscript index f1167b5..c5a0ebb 100644 --- a/resource/IPCA/samples/ElevatorServer/SConscript +++ b/resource/IPCA/samples/ElevatorServer/SConscript @@ -65,9 +65,6 @@ if elevator_server_env.get('SECURED') == '1': if target_os in ['msys_nt', 'windows']: elevator_server_env.AppendUnique(LINKFLAGS = ['/subsystem:CONSOLE']) -if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: - elevator_server_env.PrependUnique(LIBS = ['resource_directory']) - ###################################################################### # Source files and Targets ###################################################################### diff --git a/resource/IPCA/src/SConscript b/resource/IPCA/src/SConscript index c07ebdb..b4ae6e7 100644 --- a/resource/IPCA/src/SConscript +++ b/resource/IPCA/src/SConscript @@ -67,9 +67,6 @@ if ipca_env.get('SECURED') == '1': 'ocprovision' ]) -if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: - ipca_lib_env.PrependUnique(LIBS = ['resource_directory']) - ###################################################################### # Source files and Targets ###################################################################### diff --git a/resource/IPCA/unittests/SConscript b/resource/IPCA/unittests/SConscript index 80d0b4e..acd21de 100644 --- a/resource/IPCA/unittests/SConscript +++ b/resource/IPCA/unittests/SConscript @@ -79,9 +79,6 @@ if use_iotivity == 1: if target_os in ['msys_nt', 'windows']: ipcatest_env.AppendUnique(LINKFLAGS = ['/subsystem:CONSOLE']) -if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: - ipcatest_env.PrependUnique(LIBS = ['resource_directory']) - ###################################################################### # Source files and Targets ###################################################################### diff --git a/resource/csdk/connectivity/test/SConscript b/resource/csdk/connectivity/test/SConscript index 269064a..c292250 100644 --- a/resource/csdk/connectivity/test/SConscript +++ b/resource/csdk/connectivity/test/SConscript @@ -65,7 +65,6 @@ if catest_env.get('SECURED') == '1': if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: if 'CLIENT' in rd_mode and target_os not in ['arduino', 'darwin', 'ios', 'windows', 'winrt']: catest_env.PrependUnique(LIBS = ['oc', 'oc_logger']) - catest_env.PrependUnique(LIBS = ['resource_directory']) if target_os not in ['msys_nt', 'windows']: catest_env.AppendUnique(LIBS = ['m']) diff --git a/resource/csdk/security/provisioning/unittest/SConscript b/resource/csdk/security/provisioning/unittest/SConscript index 48e5e89..a224b8f 100644 --- a/resource/csdk/security/provisioning/unittest/SConscript +++ b/resource/csdk/security/provisioning/unittest/SConscript @@ -82,10 +82,6 @@ if target_os in ['msys_nt', 'windows']: else: sptest_env.AppendUnique(LIBS = ['octbstack']) -if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: - sptest_env.PrependUnique(LIBS = ['resource_directory']) - - ###################################################################### # Source files and Targets ###################################################################### diff --git a/resource/csdk/security/unittest/SConscript b/resource/csdk/security/unittest/SConscript index cb6b019..095e99d 100644 --- a/resource/csdk/security/unittest/SConscript +++ b/resource/csdk/security/unittest/SConscript @@ -79,10 +79,6 @@ else: srmtest_env.AppendUnique(CPPDEFINES = ['HAVE_LOCALTIME_R']) srmtest_env.AppendUnique(LIBS = ['octbstack']) -if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: - srmtest_env.PrependUnique(LIBS = ['resource_directory', 'oc']) - - ###################################################################### # Source files and Targets ###################################################################### diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript index 27a07e9..ed23842 100644 --- a/resource/csdk/stack/test/SConscript +++ b/resource/csdk/stack/test/SConscript @@ -66,9 +66,6 @@ if target_os in ['msys_nt', 'windows']: else: stacktest_env.PrependUnique(LIBS = ['m']) -if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: - stacktest_env.PrependUnique(LIBS = ['resource_directory']) - ###################################################################### # Source files and Targets ###################################################################### diff --git a/service/resource-encapsulation/SConscript b/service/resource-encapsulation/SConscript index 84d9fdd..4eba1b5 100644 --- a/service/resource-encapsulation/SConscript +++ b/service/resource-encapsulation/SConscript @@ -67,7 +67,7 @@ resourceClient_env.AppendUnique(CPPPATH = [ 'src/resourceCache/include' ]) -resourceClient_env.PrependUnique(LIBS = ['resource_directory', 'oc', 'rcs_common', 'octbstack','oc_logger']) +resourceClient_env.PrependUnique(LIBS = ['oc', 'rcs_common', 'octbstack','oc_logger']) if target_os not in ['windows']: resourceClient_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x']) diff --git a/service/resource-encapsulation/src/serverBuilder/SConscript b/service/resource-encapsulation/src/serverBuilder/SConscript index 1215629..e85a439 100644 --- a/service/resource-encapsulation/src/serverBuilder/SConscript +++ b/service/resource-encapsulation/src/serverBuilder/SConscript @@ -73,9 +73,6 @@ if server_builder_env.get('SECURED') == '1': if server_builder_env.get('WITH_TCP') == True: server_builder_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto']) -if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: - server_builder_env.AppendUnique(LIBS = ['resource_directory']) - ###################################################################### # Source files and Targets ###################################################################### diff --git a/service/scene-manager/sampleapp/linux/SConscript b/service/scene-manager/sampleapp/linux/SConscript index a699565..37d9e33 100644 --- a/service/scene-manager/sampleapp/linux/SConscript +++ b/service/scene-manager/sampleapp/linux/SConscript @@ -41,9 +41,6 @@ if env.get('SECURED') == '1': if 'rt' in scenemanager_sample_env.get('LIBS'): scenemanager_sample_env.Append(LIBS = ['rt']) -if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: - scenemanager_sample_env.AppendUnique(LIBS = ['resource_directory']) - if not env.get('RELEASE'): scenemanager_sample_env.PrependUnique(LIBS = ['gcov']) scenemanager_sample_env.AppendUnique(CXXFLAGS = ['--coverage']) -- 2.7.4