service/simulator: 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: I6f6e01d1c95b28637aba494feed2801670a7947f
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19565
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
(cherry picked from commit c8c8213b861b7400f66c03f4671db1bbf5b02f69)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21109
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

diff --git a/service/simulator/SConscript b/service/simulator/SConscript
index 4d55cd5..d3bc33d 100644 (file)
--- a/service/simulator/SConscript
+++ b/service/simulator/SConscript
@@ -42,16 +42,19 @@ simulator_env.AppendUnique(CPPPATH=[
     'src/client',
     'src/server',
     'src/common',
-    '../../resource/include/',
-    '../../resource/csdk/include',
-    '../../resource/csdk/stack/include',
-    '../../resource/c_common/ocrandom/include',
-    '../../resource/csdk/logger/include',
-    '../../resource/oc_logger/include',
+    '#/resource/include/',
+    '#/resource/csdk/include',
+    '#/resource/csdk/stack/include',
+    '#/resource/c_common',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
+    '#/resource/c_common/ocrandom/include',
+    '#/resource/csdk/logger/include',
+    '#/resource/oc_logger/include',
     './ramlparser/raml',
     './ramlparser/raml/model',
     './ramlparser/raml/jsonSchemaParser',
-    '../../extlibs/yaml/yaml/include',
+    '#/extlibs/yaml/yaml/include'
 ])
 
 # Including Java path for building JNI files

diff --git a/service/simulator/examples/client/SConscript b/service/simulator/examples/client/SConscript
index 590b364..335e330 100644 (file)
--- a/service/simulator/examples/client/SConscript
+++ b/service/simulator/examples/client/SConscript
@@ -8,6 +8,10 @@ sim_env = lib_env.Clone()
 ######################################################################
 sim_env.AppendUnique(CPPPATH=[
     '../../inc',
+    '#/resource/c_common',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
+    '#/resource/c_common/ocrandom/include',
     '#/resource/csdk/include',
     '#/resource/csdk/stack/include',
     '#/resource/include',
@@ -17,7 +21,6 @@ sim_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-pthread'])
 sim_env.AppendUnique(CPPDEFINES=['LINUX'])
 sim_env.AppendUnique(LIBS=['SimulatorManager'])
 
-sim_env.AppendUnique(LIBPATH=[env.get('BUILD_DIR')])
 sim_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 sim_env.PrependUnique(LIBS=['SimulatorManager'])
 

diff --git a/service/simulator/examples/server/SConscript b/service/simulator/examples/server/SConscript
index c2f54ed..0b25fea 100644 (file)
--- a/service/simulator/examples/server/SConscript
+++ b/service/simulator/examples/server/SConscript
@@ -8,17 +8,20 @@ sim_env = lib_env.Clone()
 ######################################################################
 sim_env.AppendUnique(CPPPATH=[
     '#/resource/c_common/octimer/include',
-    '../../inc',
+    '#/resource/c_common',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
+    '#/resource/c_common/ocrandom/include',
     '#/resource/csdk/include',
     '#/resource/csdk/stack/include',
     '#/resource/include',
-    '#/resource/oc_logger/include'
+    '#/resource/oc_logger/include',
+    '#/service/simulator/inc'
 ])
 sim_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-pthread'])
 sim_env.AppendUnique(CPPDEFINES=['LINUX'])
 sim_env.AppendUnique(LIBS=['SimulatorManager'])
 
-sim_env.AppendUnique(LIBPATH=[env.get('BUILD_DIR')])
 sim_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 sim_env.PrependUnique(LIBS=['SimulatorManager'])