Update SConscript of connectivity-abstraction

currently bt_edr_adapter is not supported on linux platform.
but if TARGET_TRANSPORT=ALL is used, all adapters are included.

Change-Id: I4439154a4f08c5e040b7a63f104052c6a5aa1097
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11111
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 4068924..e0a1e49 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -128,11 +128,30 @@ ca_common_src = [
 env.AppendUnique(CA_SRC = ca_common_src)
 
 if 'ALL' in ca_transport:
-               transports = [ 'ip_adapter', 'bt_edr_adapter', 'bt_le_adapter']
+               transports = []
+
                if with_ra:
-                               transports.append ('ra_adapter')
-               if ca_os in ['android']:
-                               transports.append ('nfc_adapter')
+                               transports.append('ra_adapter')
+
+               if ca_os in ['linux']: 
+                               transports.append('ip_adapter')
+                               transports.append('bt_le_adapter')
+               elif ca_os in ['tizen']: 
+                               transports.append('ip_adapter')
+                               transports.append('bt_edr_adapter')
+                               transports.append('bt_le_adapter')
+               elif ca_os in ['android']: 
+                               transports.append('ip_adapter')
+                               transports.append('bt_edr_adapter')
+                               transports.append('bt_le_adapter')
+                               transports.append('nfc_adapter')
+               elif ca_os in['darwin','ios', 'msys_nt', 'windows']:
+                               transports.append('ip_adapter')
+               else:
+                               transports.append('ip_adapter')
+                               transports.append('bt_edr_adapter')
+                               transports.append('bt_le_adapter')
+
                env.SConscript(dirs = [
                                os.path.join(ca_path, d) for d in transports ])
 

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/SConscript b/resource/csdk/connectivity/src/bt_edr_adapter/SConscript
index d7da75a..e441903 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/SConscript
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/SConscript
@@ -36,6 +36,6 @@ if os.path.exists(target_sconscript_abspath):
 # the list.
 target_files = [ os.path.join(src_dir, target_os, f) for f in target_files ]
 
-# The list of BLE adapter source files is a combination of both the
+# The list of EDR adapter source files is a combination of both the
 # common and target-specific source file lists.
 env.AppendUnique(CA_SRC = common_files + target_files)

diff --git a/resource/csdk/connectivity/src/tcp_adapter/SConscript b/resource/csdk/connectivity/src/tcp_adapter/SConscript
index 7972635..20e0057 100644 (file)
--- a/resource/csdk/connectivity/src/tcp_adapter/SConscript
+++ b/resource/csdk/connectivity/src/tcp_adapter/SConscript
@@ -44,6 +44,6 @@ target_files = [ os.path.join(src_dir, target_os, f) for f in target_files ]
 
 # Source files to build for Linux-like platforms
 
-# The list of BLE adapter source files is a combination of both the
+# The list of TCP adapter source files is a combination of both the
 # common and target-specific source file lists.
 env.AppendUnique(CA_SRC = common_files + target_files)
\ No newline at end of file