X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2FSConscript;h=1abd0ce3d266081f912109029de7649aa25b82c5;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=44921de3c86276c06618c06dee3b8188d16eff47;hpb=fa393dc92a9ea0e8809d4474d54d916e845b2d0e;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript index 44921de..1abd0ce 100644 --- a/resource/csdk/connectivity/src/SConscript +++ b/resource/csdk/connectivity/src/SConscript @@ -1,7 +1,6 @@ ## # CA build script ## - import os.path Import('env') @@ -9,7 +8,10 @@ Import('env') ca_os = env.get('TARGET_OS') ca_transport = env.get('TARGET_TRANSPORT') secured = env.get('SECURED') +with_mbedtls_static = env.get('WITH_MBEDTLS_STATIC_LIB'); +multiple_owner = env.get('MULTIPLE_OWNER') with_ra = env.get ('WITH_RA') +with_ra_ibb = env.get('WITH_RA_IBB') with_tcp = env.get('WITH_TCP') src_dir = env.get('SRC_DIR') root_dir = os.pardir @@ -22,11 +24,23 @@ ca_path = os.curdir print"Reading ca script %s"%ca_transport env.PrependUnique(CPPPATH = [ os.path.join(root_dir, 'api') ]) + +with_upstream_libcoap = env.get('WITH_UPSTREAM_LIBCOAP') +if with_upstream_libcoap == '1': + # For bring up purposes only, we manually copy the forked version to where the unforked version is downloaded. + env.AppendUnique(CPPPATH = [os.path.join('#extlibs', 'libcoap', 'libcoap', 'include')]) + env.AppendUnique(CPPDEFINES = ['WITH_UPSTREAM_LIBCOAP']) +else: + # For bring up purposes only, the forked version will live here. + env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'lib', 'libcoap-4.1.1', 'include')]) + 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', 'stack', 'include'), os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'), os.path.join(root_dir, 'common', 'inc'), - os.path.join(root_dir, 'util', 'inc') ]) + os.path.join(root_dir, '/usr', 'include','glib-2.0'), + os.path.join(root_dir, '/usr', 'lib','glib-2.0', 'include'), + os.path.join(root_dir, 'util', 'inc')]) if ca_os not in ['arduino', 'windows']: env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) @@ -43,51 +57,44 @@ env.SConscript(os.path.join(root_dir, 'common', 'SConscript')) # Getting util source files env.SConscript(os.path.join(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. build_dir = env.get('BUILD_DIR') -if env.get('SECURED') == '1': - env.SConscript(build_dir + 'extlibs/tinydtls/SConscript') - env.SConscript(build_dir + 'extlibs/timer/SConscript') - env.AppendUnique(CPPPATH = ['#extlibs/timer']) - env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/connectivity/inc/pkix']) 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': +if (('BLE' in ca_transport) or ('ALL' in ca_transport)): 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': - 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) + 'adapter_util/cafragmentation.c')]) -if ((secured == '1') and (with_tcp == True)): - env.AppendUnique(CPPDEFINES = ['__WITH_TLS__']) +if env.get('SECURED') == '1': + env.SConscript(build_dir + 'extlibs/timer/SConscript') + env.AppendUnique(CPPPATH = ['#extlibs/timer']) + env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/security/include']) + env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__']) + env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'external/inc')]) tls_path = 'extlibs/mbedtls'; tls_headers_path = 'mbedtls/include'; if ca_os == 'tizen' and os.path.exists(root_dir + '/' + tls_path): env.SConscript(os.path.join(root_dir, tls_path + '/SConscript')) env.AppendUnique(CPPPATH = [os.path.join(root_dir, tls_path + '/' + tls_headers_path)]) else: - if ca_os != 'android': + if ca_os != 'android' and env.get('PLATFORM_TLS') == '0': env.SConscript('#' + tls_path + '/SConscript') env.AppendUnique(CPPPATH = ['#' + tls_path + '/' + tls_headers_path]) - env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_tls.c')]) + env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_ssl.c')]) + +if ((secured == '1') and (with_tcp == True)): + env.AppendUnique(CPPDEFINES = ['__WITH_TLS__']) + +if (multiple_owner == '1'): + env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER']) + ca_common_src = None +if with_ra_ibb: + env.SConscript('#extlibs/wksxmppxep/SConscript') + if env.get('ROUTING') == 'GW': env.AppendUnique(CPPDEFINES = ['ROUTING_GATEWAY']) elif env.get('ROUTING') == 'EP': @@ -121,12 +128,6 @@ else: 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' 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 ] @@ -139,14 +140,14 @@ if 'ALL' in ca_transport: if with_ra: transports.append('ra_adapter') - if ca_os in ['linux']: + if ca_os in ['linux']: transports.append('ip_adapter') transports.append('bt_le_adapter') - elif ca_os in ['tizen']: + elif ca_os in ['tizen']: transports.append('ip_adapter') transports.append('bt_edr_adapter') transports.append('bt_le_adapter') - elif ca_os in ['android']: + elif ca_os in ['android']: transports.append('ip_adapter') transports.append('bt_edr_adapter') transports.append('bt_le_adapter') @@ -178,7 +179,7 @@ if 'BLE' in ca_transport: if 'NFC' in ca_transport: env.SConscript(os.path.join(ca_path, 'nfc_adapter/SConscript')) -if ca_os in ['linux', 'tizen', 'android']: +if ca_os in ['linux', 'tizen', 'android', 'ios', 'tizenrt']: if with_tcp == True: env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript')) env.AppendUnique(CPPDEFINES = ['WITH_TCP']) @@ -199,23 +200,32 @@ if env.get('LOGGING'): if ca_os == 'android': lib_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libconnectivity_abstraction.so']) +if lib_env.get('SECURED') == '1': + if ca_os in ['windows', 'msys_nt', 'ios']: + lib_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto']) + lib_env.AppendUnique(LIBS = ['timer']) + else: + if with_mbedtls_static == '1': + lib_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto']) + lib_env.AppendUnique(LIBS = ['timer']) + else: + lib_env.AppendUnique(LIBPATH = [lib_env.get('BUILD_DIR')]) + lib_env.AppendUnique(RPATH = [lib_env.get('BUILD_DIR')]) + lib_env.PrependUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto']) + lib_env.PrependUnique(LIBS = ['timer']) + if ca_os in ['android', 'tizen', 'linux']: 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': lib_env.AppendUnique(LIBS = ['rt']) - if ((lib_env.get('SECURED') == '1') and ((lib_env.get('WITH_TCP')) or (lib_env.get('WITH_CLOUD')))): - lib_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto']) - calib = lib_env.SharedLibrary('connectivity_abstraction', env.get('CA_SRC')) + static_calib = lib_env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC')) + shared_calib = lib_env.SharedLibrary('connectivity_abstraction', lib_env.get('CA_SRC')) + calib = Flatten([static_calib, shared_calib]) elif ca_os in ['msys_nt', 'windows']: lib_env.AppendUnique(LIBS = ['coap', 'mswsock', 'ws2_32', 'iphlpapi', 'logger']) - if lib_env.get('SECURED') == '1': - lib_env.AppendUnique(LIBS = ['tinydtls']) - lib_env.AppendUnique(LIBS = ['timer']) calib = lib_env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC')) else: calib = lib_env.StaticLibrary('connectivity_abstraction', lib_env.get('CA_SRC')) + lib_env.InstallTarget(calib, 'connectivity_abstraction') lib_env.UserInstallTargetLib(calib, 'connectivity_abstraction')