Merge branch '1.1-rel'

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / SConscript

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
old mode 100755 (executable)
new mode 100644 (file)
index 25d5466..3c671a3
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -25,7 +25,8 @@ env.PrependUnique(CPPPATH = [ os.path.join(root_dir, 'api') ])
 env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'inc'),
                              os.path.join(root_dir, 'lib/libcoap-4.1.1'),
                              os.path.join(src_dir, '/resource/csdk/logger/include/'),
-                             os.path.join(root_dir, 'common/inc') ])
+                             os.path.join(root_dir, 'common/inc'),
+                             os.path.join(root_dir, 'util/inc') ])
 
 if ca_os not in ['arduino', 'windows', 'winrt']:
        env.AppendUnique(CPPDEFINES = ['WITH_POSIX'])
@@ -39,6 +40,9 @@ if ca_os in ['darwin','ios']:
 # Getting common source files
 env.SConscript('./../common/SConscript')
 
+# Getting util source files
+env.SConscript(root_dir + '/util/SConscript')
+
 # The tinydtls library is found in '#extlibs/tinydtls', where the '#'
 # is interpreted by SCons as the top-level iotivity directory where
 # the SConscruct file is found.
@@ -56,8 +60,6 @@ if env.get('SECURED') == '1':
 
 env.AppendUnique(CA_SRC = [os.path.join(ca_path,
                                         'adapter_util/caadapterutils.c')])
-env.AppendUnique(CA_SRC = [os.path.join(ca_path,
-                                        'adapter_util/cafragmentation.c')])
 
 if env.get('SECURED') == '1':
        env.AppendUnique(CA_SRC = [os.path.join(ca_path,
@@ -103,7 +105,7 @@ else:
                'caqueueingthread.c',
                'caretransmission.c',
                ]
-       if (('BT' in ca_transport) or ('IP' in ca_transport) or ('ALL' in ca_transport)):
+       if (('IP' in ca_transport) or ('ALL' in ca_transport)):
                env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'cablockwisetransfer.c') ])
                env.AppendUnique(CPPDEFINES = ['WITH_BWT'])
        if secured == '1':
@@ -122,11 +124,18 @@ if 'ALL' in ca_transport:
                transports = [ 'ip_adapter', 'bt_edr_adapter', 'bt_le_adapter']
                if with_ra:
                                transports.append ('ra_adapter')
+               if ca_os in ['android']:
+                               transports.append ('nfc_adapter')
                env.SConscript(dirs = [
                                os.path.join(ca_path, d) for d in transports ])
 
 if 'IP' in ca_transport:
        env.SConscript(os.path.join(ca_path, 'ip_adapter/SConscript'))
+       if ca_os == 'arduino':
+               if with_tcp:
+                       transports = [ 'ip_adapter', 'tcp_adapter']
+                       env.SConscript(dirs = [
+                               os.path.join(ca_path, d) for d in transports ])
 
 if 'BT' in ca_transport:
        env.SConscript(os.path.join(ca_path, 'bt_edr_adapter/SConscript'))
@@ -134,21 +143,35 @@ if 'BT' in ca_transport:
 if 'BLE' in ca_transport:
        env.SConscript(os.path.join(ca_path, 'bt_le_adapter/SConscript'))
 
+if 'NFC' in ca_transport:
+       env.SConscript(os.path.join(ca_path, 'nfc_adapter/SConscript'))
+
 if ca_os in ['linux', 'tizen', 'android']:
        if with_tcp == True:
                env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript'))
+               env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
+
+if ca_os in ['linux', 'tizen', 'android', 'arduino', 'ios']:
+       if (('BLE' in ca_transport) or ('BT' in ca_transport) or ('ALL' in ca_transport)):
+               env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
 
 print "Include path is %s" % env.get('CPPPATH')
 print "Files path is %s" % env.get('CA_SRC')
+               
+lib_env = env.Clone()
+
+if ca_os == 'android':
+    lib_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libconnectivity_abstraction.so'])
+
 if ca_os in ['android', 'tizen']:
-       env.AppendUnique(LIBS = ['coap'])
-       if env.get('SECURED') == '1':
-               env.AppendUnique(LIBS = ['tinydtls'])
-               env.AppendUnique(LIBS = ['timer'])
+       lib_env.AppendUnique(LIBS = ['coap'])
+       if lib_env.get('SECURED') == '1':
+               lib_env.AppendUnique(LIBS = ['tinydtls'])
+               lib_env.AppendUnique(LIBS = ['timer'])
        if ca_os != 'android':
-               env.AppendUnique(LIBS = ['rt'])
-       calib = env.SharedLibrary('connectivity_abstraction', env.get('CA_SRC'))
+               lib_env.AppendUnique(LIBS = ['rt'])
+       calib = lib_env.SharedLibrary('connectivity_abstraction', lib_env.get('CA_SRC'))
 else:
-       calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
-env.InstallTarget(calib, 'libconnectivity_abstraction')
-
+       calib = lib_env.StaticLibrary('connectivity_abstraction', lib_env.get('CA_SRC'))
+lib_env.InstallTarget(calib, 'libconnectivity_abstraction')
+lib_env.UserInstallTargetLib(calib, 'libconnectivity_abstraction')