From: lankamadan <lanka.madan@samsung.com>
Date: Fri, 11 Sep 2015 13:34:33 +0000 (+0900)
Subject: Merge branch 'master' into easysetup
X-Git-Tag: 1.2.0+RC1~597^2^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=155e3a129b0d95d0179cc60f7c254910c0f0aa8e;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into easysetup

Conflicts:
	service/SConscript

Change-Id: I1c850a63fe8b10162a8861dc1f9e79269a7d0824
Signed-off-by: lankamadan <lanka.madan@samsung.com>
---

155e3a129b0d95d0179cc60f7c254910c0f0aa8e
diff --cc service/SConscript
index a6ca193,eadf4be..6d62ac3
--- a/service/SConscript
+++ b/service/SConscript
@@@ -26,30 -26,24 +26,25 @@@ Import('env'
  
  target_os = env.get('TARGET_OS')
  
- #if target_os not in ['arduino','darwin']:
 -if target_os not in ['arduino','darwin','ios']:
++if target_os not in ['arduino','darwin']:
  	# Build things manager project
- 	#SConscript('things-manager/SConscript')
+ 	SConscript('things-manager/SConscript')
  
  	# Build soft sensor manager project
- 	#SConscript('soft-sensor-manager/SConscript')
+ 	SConscript('soft-sensor-manager/SConscript')
  
  	# Build protocol plugin project
  	# protocol-plugin use 'inotify', this feature isn't support by MAC OSX
- 	#if target_os not in ['darwin', 'ios', 'android']:
- 	#	SConscript('protocol-plugin/SConscript')
 -	if target_os not in ['darwin', 'ios']:
++	if target_os not in ['darwin', 'ios', 'android']:
+ 		SConscript('protocol-plugin/SConscript')
  
  	# Build notification manager project
- 	#SConscript('notification-manager/SConscript')
 -	if target_os not in ['android']:
 -		SConscript('notification-manager/SConscript')
++	SConscript('notification-manager/SConscript')
 +	
 +if target_os in ['arduino','android', 'linux']:
 +	SConscript('easy-setup/SConscript')
- 	#if target_os not in ['android', 'tizen']:
- 		#SConscript('notification-manager/SConscript')
  
  	# Build resource-encapsulation project
- 	#if target_os not in ['tizen']:
- 		#SConscript('resource-encapsulation/SConscript')
 -	SConscript('resource-encapsulation/SConscript')
--#else:
--#	SConscript('notification-manager/SampleApp/arduino/SConscript')
- 
++	if target_os not in ['tizen']:
++		SConscript('resource-encapsulation/SConscript')