Merge branch 'master' into notification-service

[platform/upstream/iotivity.git] / service / SConscript

diff --git a/service/SConscript b/service/SConscript
old mode 100644 (file)
new mode 100755 (executable)
index 363f26e..e774d74
--- a/service/SConscript
+++ b/service/SConscript
@@ -26,30 +26,36 @@ Import('env')
 
 target_os = env.get('TARGET_OS')
 
-if target_os not in ['arduino','darwin', 'ios']:
+if target_os not in ['arduino','darwin', 'ios', 'windows']:
     # Build things manager project
     SConscript('things-manager/SConscript')
 
-    # Build notification manager project
+    # Build resource-hosting project
     SConscript('resource-hosting/SConscript')
 
     # Build resource-encapsulation project
     SConscript('resource-encapsulation/SConscript')
 
     # Build resource-container project
-    if target_os not in ['android']:
-        SConscript('resource-container/SConscript')
+    SConscript('resource-container/SConscript')
+
+    # Build scene-manager project
+    if target_os in ['linux']:
+        SConscript('scene-manager/SConscript')
+
+    # Build notification-service project    
+    #if target_os in ['linux','android']:
+       # SConscript('notification/SConscript')
 
     # Build simulator module
     if target_os in ['linux'] and env.get('SIMULATOR', False):
         SConscript('simulator/SConscript')
 
-    # Build resource directory project
-    if env.get('WITH_RD') == '1':
-        SConscript('resource-directory/SConscript')
+# Build resource directory project
+if env.get('WITH_RD') == '1':
+    SConscript('resource-directory/SConscript')
 
 # Build EasySetup module
-if target_os in ['arduino','android', 'linux']:
+if target_os in ['arduino', 'android', 'linux','tizen']:
     SConscript('easy-setup/SConscript')
 
-