X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2FSConscript;h=6385cd7728cad0e53d0a90fe9becd271315cb000;hb=f115d4d8aba3fdb4544b2aa86c438ddc9f7a52e0;hp=234e65ec228fc1a9598fc8e4ede3767104d85d03;hpb=255d20354567e7efb84e186d3f453b7bb53e003c;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript old mode 100755 new mode 100644 index 234e65e..6385cd7 --- a/resource/csdk/connectivity/src/SConscript +++ b/resource/csdk/connectivity/src/SConscript @@ -9,6 +9,9 @@ Import('env') 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 @@ -21,11 +24,15 @@ 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(src_dir, '/resource/csdk/logger/include/'), os.path.join(root_dir, 'common/inc') ]) if ca_os not in ['arduino', 'windows', 'winrt']: env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) +if ca_os not in ['darwin', 'ios', 'windows', 'winrt']: + env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) + if ca_os in ['darwin','ios']: env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE']) @@ -36,7 +43,16 @@ env.SConscript('./../common/SConscript') # is interpreted by SCons as the top-level iotivity directory where # the SConscruct file is found. if env.get('SECURED') == '1': - 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')]) @@ -48,23 +64,36 @@ if env.get('SECURED') == '1': 'adapter_util/caadapternetdtls.c')]) env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'external/inc')]) +if env.get('DTLS_WITH_X509') == '1': + 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/']) + env.AppendUnique(CPPDEFINES = ['__WITH_X509__']) + if not env.get('RELEASE'): + env.AppendUnique(CPPDEFINES = ['X509_DEBUG']) + pkix_src = Glob('adapter_util/pkix/*.c'); + 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']) print "setting WITH_ARDUINO" - ca_common_src = [ - 'caconnectivitymanager_singlethread.c', - 'cainterfacecontroller_singlethread.c', - 'camessagehandler_singlethread.c', + ca_common_src = [ + 'caconnectivitymanager.c', + 'cainterfacecontroller.c', + 'camessagehandler.c', 'canetworkconfigurator.c', 'caprotocolmessage.c', - 'caremotehandler.c', - 'caretransmission_singlethread.c', + 'caretransmission.c', ] else: - env.AppendUnique(CPPDEFINES = ['MULTI_THREAD']) ca_common_src = [ 'caconnectivitymanager.c', 'cainterfacecontroller.c', @@ -72,12 +101,17 @@ else: 'canetworkconfigurator.c', 'caprotocolmessage.c', 'caqueueingthread.c', - 'caremotehandler.c', 'caretransmission.c', ] + 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__']) - 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 ] @@ -85,9 +119,13 @@ ca_common_src = [ env.AppendUnique(CA_SRC = ca_common_src) if 'ALL' in ca_transport: - transports = [ 'ip_adapter', 'bt_edr_adapter', 'bt_le_adapter' ] - env.SConscript(dirs = [ - os.path.join(ca_path, d) for d in transports ]) + 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')) @@ -98,11 +136,28 @@ 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') if ca_os in ['android', 'tizen']: + env.AppendUnique(LIBS = ['coap']) + if env.get('SECURED') == '1': + env.AppendUnique(LIBS = ['tinydtls']) + env.AppendUnique(LIBS = ['timer']) + if ca_os != 'android': + env.AppendUnique(LIBS = ['rt']) calib = env.SharedLibrary('connectivity_abstraction', env.get('CA_SRC')) else: calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC')) env.InstallTarget(calib, 'libconnectivity_abstraction') -