service/resource-container: SConscript cleanup

This is a scons scripts cleanup left after fixing /W4 warnings for Windows.

Preparing SConscript files for removal of arbitrary global "env"
modifications in script files outside build_common/ directory.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I637d27e2debfd184a19755eea56fbdeb083cd0b6
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21095
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

diff --git a/service/resource-container/SConscript b/service/resource-container/SConscript
index 7f758df..34a23ad 100644 (file)
--- a/service/resource-container/SConscript
+++ b/service/resource-container/SConscript
@@ -69,6 +69,9 @@ if int(containerJavaSupport):
 
 resource_container_env.AppendUnique(CPPPATH=[
     '#/extlibs',
+    '#/resource/c_common',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
     '#/resource/csdk/include',
     '#/resource/csdk/stack/include',
     '#/resource/include',

diff --git a/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript b/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript
index e108a83..39e04df 100644 (file)
--- a/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript
+++ b/service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript
@@ -14,7 +14,6 @@ SConscript('#service/third_party_libs.scons',
 linux_sample_env.AppendUnique(CPPPATH=['include'])
 linux_sample_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-pthread'])
 linux_sample_env.AppendUnique(CPPDEFINES=['LINUX'])
-linux_sample_env.AppendUnique(LIBPATH=[env.get('BUILD_DIR')])
 linux_sample_env.AppendUnique(LIBS=[
     'coap',
     'connectivity_abstraction',

diff --git a/service/resource-container/examples/BMISensorBundle/src/inputSensors/SConscript b/service/resource-container/examples/BMISensorBundle/src/inputSensors/SConscript
index bbf1072..ac6da0c 100644 (file)
--- a/service/resource-container/examples/BMISensorBundle/src/inputSensors/SConscript
+++ b/service/resource-container/examples/BMISensorBundle/src/inputSensors/SConscript
@@ -25,6 +25,9 @@ target_os = env.get('TARGET_OS')
 linux_sample_env = env.Clone()
 
 linux_sample_env.AppendUnique(CPPPATH=[
+    '#/resource/c_common',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
     '#/resource/csdk/include',
     '#/resource/csdk/stack/include',
     '#/resource/include',

diff --git a/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript b/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript
index 26987d9..37bfa8b 100644 (file)
--- a/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript
+++ b/service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript
@@ -14,7 +14,6 @@ SConscript(
 linux_sample_env.AppendUnique(CPPPATH=['include'])
 linux_sample_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-pthread'])
 linux_sample_env.AppendUnique(CPPDEFINES=['LINUX'])
-linux_sample_env.AppendUnique(LIBPATH=[env.get('BUILD_DIR')])
 linux_sample_env.AppendUnique(LIBS=[
     'coap',
     'connectivity_abstraction',

diff --git a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript
index 7439a19..5502336 100644 (file)
--- a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript
+++ b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript
@@ -25,6 +25,9 @@ target_os = env.get('TARGET_OS')
 linux_sample_env = env.Clone()
 
 linux_sample_env.AppendUnique(CPPPATH=[
+    '#/resource/c_common',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
     '#/resource/csdk/include',
     '#/resource/csdk/stack/include',
     '#/resource/include',

diff --git a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript
index df86ae8..e1088d1 100644 (file)
--- a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript
+++ b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript
@@ -14,7 +14,6 @@ SConscript('#service/third_party_libs.scons',
 linux_sample_env.AppendUnique(CPPPATH=['include'])
 linux_sample_env.AppendUnique(CXXFLAGS=['-Wall', '-pthread', '-std=c++0x'])
 linux_sample_env.AppendUnique(CPPDEFINES=['LINUX'])
-linux_sample_env.AppendUnique(LIBPATH=[env.get('BUILD_DIR')])
 linux_sample_env.AppendUnique(LIBS=[
     'coap',
     'connectivity_abstraction',

diff --git a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript
index 2452f1a..c69f095 100644 (file)
--- a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript
+++ b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript
@@ -14,7 +14,6 @@ SConscript('#service/third_party_libs.scons',
 linux_sample_env.AppendUnique(CPPPATH=['include'])
 linux_sample_env.AppendUnique(CXXFLAGS=['-Wall', '-pthread', '-std=c++0x'])
 linux_sample_env.AppendUnique(CPPDEFINES=['LINUX'])
-linux_sample_env.AppendUnique(LIBPATH=[env.get('BUILD_DIR')])
 linux_sample_env.AppendUnique(LIBS=[
     'coap',
     'connectivity_abstraction',