Replace TAB characters with space characters
authorDan Mihai <Daniel.Mihai@microsoft.com>
Fri, 28 Apr 2017 17:20:08 +0000 (10:20 -0700)
committerDan Mihai <Daniel.Mihai@microsoft.com>
Mon, 1 May 2017 18:57:38 +0000 (18:57 +0000)
This file was using a combination of them.

(Clean-up requested by reviewers of
 https://gerrit.iotivity.org/gerrit/#/c/18981/)

Change-Id: Id1a8a0ae5f4f9bf718fc91c581ca46b865d26126
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19435
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
resource/csdk/connectivity/src/SConscript

index 3033fd6..19615c7 100644 (file)
@@ -26,17 +26,19 @@ connectivity_env.PrependUnique(CPPPATH = [ os.path.join(root_dir, 'api') ])
 
 with_upstream_libcoap = connectivity_env.get('WITH_UPSTREAM_LIBCOAP')
 if with_upstream_libcoap == '1':
-       connectivity_env.AppendUnique(CPPPATH = [os.path.join('#extlibs', 'libcoap', 'libcoap', 'include')])
+    connectivity_env.AppendUnique(CPPPATH = [os.path.join('#extlibs', 'libcoap', 'libcoap', 'include')])
 else:
-       connectivity_env.AppendUnique(CPPPATH = [ os.path.join('#resource', 'csdk', 'connectivity', 'lib', 'libcoap-4.1.1', 'include')])
+    connectivity_env.AppendUnique(CPPPATH = [ os.path.join('#resource', 'csdk', 'connectivity', 'lib', 'libcoap-4.1.1', 'include')])
 
-connectivity_env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'inc'),
-                             os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
-                             os.path.join(root_dir, 'common', 'inc'),
-                             os.path.join(root_dir, 'util', 'inc') ])
+connectivity_env.AppendUnique(CPPPATH = [
+        os.path.join(root_dir, 'inc'),
+        os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
+        os.path.join(root_dir, 'common', 'inc'),
+        os.path.join(root_dir, 'util', 'inc'),
+        ])
 
 if ca_os not in ['darwin', 'ios', 'windows']:
-       connectivity_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined'])
+    connectivity_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined'])
 
 # Getting common source files
 connectivity_env.SConscript(os.path.join(root_dir, 'common', 'SConscript'), exports = 'connectivity_env')
@@ -46,12 +48,10 @@ connectivity_env.SConscript(os.path.join(root_dir, 'util', 'SConscript'), export
 
 build_dir = connectivity_env.get('BUILD_DIR')
 
-connectivity_env.AppendUnique(CA_SRC = [os.path.join(ca_path,
-                                        'adapter_util/caadapterutils.c')])
+connectivity_env.AppendUnique(CA_SRC = [os.path.join(ca_path,'adapter_util/caadapterutils.c')])
 
 if (('BLE' in ca_transport) or ('ALL' in ca_transport)):
-       connectivity_env.AppendUnique(CA_SRC = [os.path.join(ca_path,
-                                          'adapter_util/cafragmentation.c')])
+    connectivity_env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/cafragmentation.c')])
 
 # Build mbedtls as ocstack uses hash functions from mbedcrypto.lib.
 tls_path = 'extlibs/mbedtls';
@@ -65,39 +65,39 @@ else:
     connectivity_env.AppendUnique(CPPPATH = ['#' + tls_path + '/' + tls_headers_path])
 
 if connectivity_env.get('SECURED') == '1':
-       connectivity_env.AppendUnique(CPPPATH = ['#/resource/c_common/octimer/include'])
-       connectivity_env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/security/include'])
-       connectivity_env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'external/inc')])
-       if ca_os != 'tizen' or os.path.exists(root_dir + '/' + tls_path) == False:
-               connectivity_env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_ssl.c')])
+    connectivity_env.AppendUnique(CPPPATH = ['#/resource/c_common/octimer/include'])
+    connectivity_env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/security/include'])
+    connectivity_env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'external/inc')])
+    if ca_os != 'tizen' or os.path.exists(root_dir + '/' + tls_path) == False:
+        connectivity_env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_ssl.c')])
 
 ca_common_src = None
 
 if with_ra_ibb:
-       connectivity_env.SConscript('#extlibs/wksxmppxep/SConscript')
+    connectivity_env.SConscript('#extlibs/wksxmppxep/SConscript')
 
 if ca_os == 'arduino':
-       print "setting WITH_ARDUINO"
-       ca_common_src = [
-               'caconnectivitymanager.c',
-               'cainterfacecontroller.c',
-               'camessagehandler.c',
-               'canetworkconfigurator.c',
-               'caprotocolmessage.c',
-               'caretransmission.c',
-               ]
+    print "setting WITH_ARDUINO"
+    ca_common_src = [
+        'caconnectivitymanager.c',
+        'cainterfacecontroller.c',
+        'camessagehandler.c',
+        'canetworkconfigurator.c',
+        'caprotocolmessage.c',
+        'caretransmission.c',
+        ]
 else:
-       ca_common_src = [
-               'caconnectivitymanager.c',
-               'cainterfacecontroller.c',
-               'camessagehandler.c',
-               'canetworkconfigurator.c',
-               'caprotocolmessage.c',
-               'caqueueingthread.c',
-               'caretransmission.c',
-               ]
-       if (('IP' in ca_transport) or ('ALL' in ca_transport)):
-               connectivity_env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'cablockwisetransfer.c') ])
+    ca_common_src = [
+        'caconnectivitymanager.c',
+        'cainterfacecontroller.c',
+        'camessagehandler.c',
+        'canetworkconfigurator.c',
+        'caprotocolmessage.c',
+        'caqueueingthread.c',
+        'caretransmission.c',
+        ]
+    if (('IP' in ca_transport) or ('ALL' in ca_transport)):
+        connectivity_env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'cablockwisetransfer.c') ])
 
 ca_common_src = [
         os.path.join(ca_path, d) for d in ca_common_src ]
@@ -106,47 +106,47 @@ connectivity_env.AppendUnique(CA_SRC = ca_common_src)
 
 transports = set()
 if 'ALL' in ca_transport:
-               if with_ra:
-                               transports.add('ra_adapter')
-
-               if ca_os in ['linux']:
-                               transports.add('ip_adapter')
-                               transports.add('bt_le_adapter')
-               elif ca_os in ['tizen']:
-                               transports.add('ip_adapter')
-                               transports.add('bt_edr_adapter')
-                               transports.add('bt_le_adapter')
-               elif ca_os in ['android']:
-                               transports.add('ip_adapter')
-                               transports.add('bt_edr_adapter')
-                               transports.add('bt_le_adapter')
-                               transports.add('nfc_adapter')
-               elif ca_os in['darwin','ios', 'msys_nt', 'windows']:
-                               transports.add('ip_adapter')
-               else:
-                               transports.add('ip_adapter')
-                               transports.add('bt_edr_adapter')
-                               transports.add('bt_le_adapter')
-
-               connectivity_env.SConscript(dirs = [
-                               os.path.join(ca_path, d) for d in transports ], exports = 'connectivity_env')
+    if with_ra:
+        transports.add('ra_adapter')
+
+    if ca_os in ['linux']:
+        transports.add('ip_adapter')
+        transports.add('bt_le_adapter')
+    elif ca_os in ['tizen']:
+        transports.add('ip_adapter')
+        transports.add('bt_edr_adapter')
+        transports.add('bt_le_adapter')
+    elif ca_os in ['android']:
+        transports.add('ip_adapter')
+        transports.add('bt_edr_adapter')
+        transports.add('bt_le_adapter')
+        transports.add('nfc_adapter')
+    elif ca_os in['darwin','ios', 'msys_nt', 'windows']:
+        transports.add('ip_adapter')
+    else:
+        transports.add('ip_adapter')
+        transports.add('bt_edr_adapter')
+        transports.add('bt_le_adapter')
+
+    connectivity_env.SConscript(dirs = [
+        os.path.join(ca_path, d) for d in transports ], exports = 'connectivity_env')
 
 if 'IP' in ca_transport:
-       transports.add('ip_adapter')
-       if ca_os == 'arduino' and with_tcp:
-               transports.add('tcp_adapter')
+    transports.add('ip_adapter')
+    if ca_os == 'arduino' and with_tcp:
+        transports.add('tcp_adapter')
 
 if 'BT' in ca_transport:
-       transports.add('bt_edr_adapter')
+    transports.add('bt_edr_adapter')
 
 if 'BLE' in ca_transport:
-       transports.add('bt_le_adapter')
+    transports.add('bt_le_adapter')
 
 if 'NFC' in ca_transport:
-       transports.add('nfc_adapter')
+    transports.add('nfc_adapter')
 
 if ca_os in ['linux', 'tizen', 'android', 'ios', 'windows'] and with_tcp:
-       transports.add('tcp_adapter')
+    transports.add('tcp_adapter')
 
 SConscript(dirs = list(transports), exports='connectivity_env')
 
@@ -154,27 +154,27 @@ print "Include path is %s" % connectivity_env.get('CPPPATH')
 print "Files path is %s" % connectivity_env.get('CA_SRC')
 
 if ca_os == 'android':
-       connectivity_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libca-interface.so'])
-       connectivity_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libconnectivity_abstraction.so'])
+    connectivity_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libca-interface.so'])
+    connectivity_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libconnectivity_abstraction.so'])
 
 if connectivity_env.get('SECURED') == '1':
-       connectivity_env.AppendUnique(LIBS = ['mbedtls','mbedx509'])
+    connectivity_env.AppendUnique(LIBS = ['mbedtls','mbedx509'])
 
 # c_common calls into mbedcrypto.
 connectivity_env.AppendUnique(LIBS = ['mbedcrypto'])
 
 if ca_os in ['android', 'tizen', 'linux', 'yocto']:
-       connectivity_env.AppendUnique(LIBS = ['coap'])
-       if ca_os != 'android':
-               connectivity_env.AppendUnique(LIBS = ['rt'])
-       static_calib = connectivity_env.StaticLibrary('connectivity_abstraction', connectivity_env.get('CA_SRC'))
-       shared_calib = connectivity_env.SharedLibrary('connectivity_abstraction', connectivity_env.get('CA_SRC'))
-       calib = Flatten([static_calib, shared_calib])
+    connectivity_env.AppendUnique(LIBS = ['coap'])
+    if ca_os != 'android':
+        connectivity_env.AppendUnique(LIBS = ['rt'])
+    static_calib = connectivity_env.StaticLibrary('connectivity_abstraction', connectivity_env.get('CA_SRC'))
+    shared_calib = connectivity_env.SharedLibrary('connectivity_abstraction', connectivity_env.get('CA_SRC'))
+    calib = Flatten([static_calib, shared_calib])
 elif ca_os in ['msys_nt', 'windows']:
-       connectivity_env.AppendUnique(LIBS = ['coap', 'mswsock', 'ws2_32', 'iphlpapi', 'logger'])
-       calib = connectivity_env.StaticLibrary('connectivity_abstraction', connectivity_env.get('CA_SRC'))
+    connectivity_env.AppendUnique(LIBS = ['coap', 'mswsock', 'ws2_32', 'iphlpapi', 'logger'])
+    calib = connectivity_env.StaticLibrary('connectivity_abstraction', connectivity_env.get('CA_SRC'))
 else:
-       calib = connectivity_env.StaticLibrary('connectivity_abstraction', connectivity_env.get('CA_SRC'))
+    calib = connectivity_env.StaticLibrary('connectivity_abstraction', connectivity_env.get('CA_SRC'))
 
 connectivity_env.InstallTarget(calib, 'connectivity_abstraction')
 connectivity_env.UserInstallTargetLib(calib, 'connectivity_abstraction')