From: lankamadan Date: Fri, 11 Sep 2015 13:34:33 +0000 (+0900) Subject: Merge easysetup branch into master X-Git-Tag: 1.2.0+RC1~1086^2~27^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7aa6219a4656ec0eaeaa43626f6872be5792b2ee;p=platform%2Fupstream%2Fiotivity.git Merge easysetup branch into master Conflicts: resource/csdk/connectivity/SConscript resource/csdk/stack/src/ocstack.c service/SConscript Change-Id: I1c850a63fe8b10162a8861dc1f9e79269a7d0824 Signed-off-by: lankamadan --- 7aa6219a4656ec0eaeaa43626f6872be5792b2ee 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')