X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fsimulator%2FSConscript;h=867584f5767fb58ef74141bd206d6cb11d5ff0c7;hb=d9aac64c8e54ea9fb0170c7511b12529389e6986;hp=ce9a46cea49a844783995c06a4db1a19648ee277;hpb=bf47539830e33f1b134368f5223bbfe1792c5ce3;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/simulator/SConscript b/service/simulator/SConscript
old mode 100644
new mode 100755
index ce9a46c..867584f
--- a/service/simulator/SConscript
+++ b/service/simulator/SConscript
@@ -22,18 +22,22 @@
 # Simulator build script
 ##
 
-import os
+import os, sys
 Import('env')
 
 lib_env = env.Clone()
-SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
+src_dir = env.get('SRC_DIR')
+SConscript(src_dir + '/service/third_party_libs.scons', 'lib_env')
 simulator_env = lib_env.Clone()
 
+#Raml Parser
+SConscript('ramlparser/SConscript')
+
 target_os = env.get('TARGET_OS')
 ######################################################################
 # Build flags
 ######################################################################
-simulator_env.AppendUnique(CPPPATH = ['inc', 'src'])
+simulator_env.AppendUnique(CPPPATH = ['inc', 'src/client', 'src/server', 'src/common'])
 simulator_env.AppendUnique(CPPPATH = [
 		'../../resource/include/',
 		'../../resource/csdk/stack/include',
@@ -42,6 +46,7 @@ simulator_env.AppendUnique(CPPPATH = [
 		'../../resource/oc_logger/include',
 		'./ramlparser/raml',
 		'./ramlparser/raml/model',		
+		'./ramlparser/raml/jsonSchemaParser',	
 		'../../extlibs/yaml/yaml/include'
 		])
 
@@ -64,7 +69,7 @@ java_headers.append(os.path.join(java_headers[0], 'solaris'))
 simulator_env.AppendUnique(CPPPATH = java_headers)
 
 simulator_env.AppendUnique(CPPPATH = ['../../extlibs/cjson'])
-simulator_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap','RamlParser','YamlParser'])
+simulator_env.PrependUnique(LIBS = ['oc', 'octbstack', 'RamlParser'])
 simulator_env.AppendUnique(LIBS = ['pthread'])
 
 simulator_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
@@ -72,13 +77,14 @@ simulator_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0
 ######################################################################
 # Source files and Targets
 ######################################################################
-simulator_src = [env.Glob('src/*.cpp'), env.Glob('java/jni/*.cpp')]
+simulator_src = [env.Glob('src/*.cpp')
+                 ,env.Glob('src/*/*.cpp')
+                 ,env.Glob('java/jni/*.cpp')
+                ]
 simulatorsdk = simulator_env.SharedLibrary('SimulatorManager', simulator_src)
 
-simulator_env.InstallTarget(simulatorsdk, 'libSimulator')
+simulator_env.InstallTarget(simulatorsdk, 'libSimulatorManager')
 
 #Build sample application
 SConscript('examples/server/SConscript')
-SConscript('examples/client-controller/SConscript')
-#Raml Parser
-SConscript('ramlparser/SConscript')
+SConscript('examples/client/SConscript')