X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2FSConscript;h=3c671a3019840c91900385746db20001c1acc071;hb=442026128ead8780fa45d0db8a6f17be7c9220e0;hp=58334a0ff6bcbe90a3bf7cedd87b39694fcdb4a7;hpb=6c759a29639dece204d1b9f8fef296140e934899;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript index 58334a0..3c671a3 100644 --- a/resource/csdk/connectivity/src/SConscript +++ b/resource/csdk/connectivity/src/SConscript @@ -10,6 +10,8 @@ ca_os = env.get('TARGET_OS') ca_transport = env.get('TARGET_TRANSPORT') secured = env.get('SECURED') with_ra = env.get ('WITH_RA') +with_tcp = env.get('WITH_TCP') +src_dir = env.get('SRC_DIR') root_dir = os.pardir ca_path = os.curdir @@ -22,7 +24,9 @@ print"Reading ca script %s"%ca_transport 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(root_dir, 'common/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 ['arduino', 'windows', 'winrt']: env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) @@ -36,28 +40,33 @@ 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. if env.get('SECURED') == '1': - if ca_os == 'tizen': - env.SConscript(os.path.join(root_dir, 'extlibs/tinydtls/SConscript')) - else: - env.SConscript('#extlibs/tinydtls/SConscript') + if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/tinydtls'): + env.SConscript(os.path.join(root_dir, 'extlibs/tinydtls/SConscript')) + else: + env.SConscript('#extlibs/tinydtls/SConscript') + if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/timer'): + env.SConscript(os.path.join(root_dir, 'extlibs/timer/SConscript')) + env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/timer')]) + else: + env.SConscript('#extlibs/timer/SConscript') + env.AppendUnique(CPPPATH = ['#extlibs/timer']) 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 ca_os in ['android', 'tizen']: - env.AppendUnique(CA_SRC=[os.path.join(ca_path, 'adapter_util/ifaddrs.c')]) + if env.get('SECURED') == '1': env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/caadapternetdtls.c')]) env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'external/inc')]) if env.get('DTLS_WITH_X509') == '1': - src_dir = env.get('SRC_DIR') env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/connectivity/inc/pkix']) env.AppendUnique(CPPPATH = [src_dir + '/extlibs/tinydtls/ecc/']) env.AppendUnique(CPPPATH = [src_dir + '/extlibs/tinydtls/sha2/']) @@ -68,6 +77,12 @@ if env.get('DTLS_WITH_X509') == '1': env.AppendUnique(CA_SRC = pkix_src) ca_common_src = None + +if env.get('ROUTING') == 'GW': + env.AppendUnique(CPPDEFINES = ['ROUTING_GATEWAY']) +elif env.get('ROUTING') == 'EP': + env.AppendUnique(CPPDEFINES = ['ROUTING_EP']) + if ca_os == 'arduino': env.AppendUnique(CPPDEFINES = ['SINGLE_THREAD']) env.AppendUnique(CPPDEFINES = ['WITH_ARDUINO']) @@ -90,15 +105,15 @@ 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': env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__']) - if ca_os == 'tizen': - env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/tinydtls')]) - else: - env.AppendUnique(CPPPATH = ['#extlibs/tinydtls']) + if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/tinydtls'): + env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/tinydtls')]) + else: + env.AppendUnique(CPPPATH = ['#extlibs/tinydtls']) ca_common_src = [ os.path.join(ca_path, d) for d in ca_common_src ] @@ -106,14 +121,21 @@ 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 = [ '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')) @@ -121,17 +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']) + 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') -env.UserInstallTargetLib(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')