X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2FSConscript;h=5420d9898fd0fde77dc4417ac2243e6f277f5d6b;hb=8229635f6d207516ccbbdf23b13be164e0fc1787;hp=b2165a34152c78b08b06774fa73585fce10cd087;hpb=8031c99214e4213a202edef846de68ad5f080fa0;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript index b2165a3..5420d98 100644 --- a/resource/csdk/SConscript +++ b/resource/csdk/SConscript @@ -24,14 +24,16 @@ Import('env') lib_env = env.Clone() -SConscript(env.get('SRC_DIR') + '/resource/third_party_libs.scons', 'lib_env') +SConscript('#resource/third_party_libs.scons', 'lib_env') liboctbstack_env = lib_env.Clone() target_os = env.get('TARGET_OS') +rd_mode = env.get('RD_MODE') with_ra = env.get('WITH_RA') with_ra_ibb = env.get('WITH_RA_IBB') with_tcp = env.get('WITH_TCP') +with_mq = env.get('WITH_MQ') # As in the source code, it includes arduino Time library (C++) # It requires compile the .c with g++ if target_os == 'arduino': @@ -41,6 +43,14 @@ if target_os == 'arduino': ###################################################################### # Build flags ###################################################################### +with_upstream_libcoap = liboctbstack_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. + liboctbstack_env.PrependUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include']) +else: + # For bring up purposes only, the forked version will live here. + liboctbstack_env.PrependUnique(CPPPATH = ['connectivity/lib/libcoap-4.1.1/include']) + liboctbstack_env.PrependUnique(CPPPATH = [ '../../extlibs/cjson/', '../../extlibs/timer/', @@ -48,9 +58,9 @@ liboctbstack_env.PrependUnique(CPPPATH = [ 'stack/include', 'stack/include/internal', '../oc_logger/include', - 'connectivity/lib/libcoap-4.1.1', 'connectivity/common/inc', 'connectivity/inc', + 'connectivity/inc/pkix', 'connectivity/api', 'connectivity/external/inc', 'security/include', @@ -58,8 +68,15 @@ liboctbstack_env.PrependUnique(CPPPATH = [ 'security/provisioning/include', ]) -if target_os not in ['arduino', 'windows', 'winrt']: - liboctbstack_env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) +if 'SUB' in with_mq: + liboctbstack_env.AppendUnique(CPPDEFINES = ['MQ_SUBSCRIBER', 'WITH_MQ']) +if 'PUB' in with_mq: + liboctbstack_env.AppendUnique(CPPDEFINES = ['MQ_PUBLISHER', 'WITH_MQ']) +if 'BROKER' in with_mq: + liboctbstack_env.AppendUnique(CPPDEFINES = ['MQ_BROKER', 'WITH_MQ']) + +if target_os not in ['arduino', 'windows']: + liboctbstack_env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '_GNU_SOURCE']) liboctbstack_env.AppendUnique(CFLAGS = ['-std=c99']) if liboctbstack_env.get('ROUTING') == 'GW': @@ -67,13 +84,23 @@ if liboctbstack_env.get('ROUTING') == 'GW': elif liboctbstack_env.get('ROUTING') == 'EP': liboctbstack_env.AppendUnique(CPPDEFINES = ['ROUTING_EP']) -if target_os not in ['windows', 'winrt']: +if liboctbstack_env.get('WITH_PROXY'): + liboctbstack_env.AppendUnique(CPPDEFINES = ['WITH_CHPROXY']) + +if target_os not in ['windows']: liboctbstack_env.AppendUnique(CFLAGS = ['-Wall']) liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) liboctbstack_env.PrependUnique(LIBS = ['ocsrm', 'coap']) -if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows']: + +if target_os in ['linux'] and liboctbstack_env.get('SIMULATOR', False): + liboctbstack_env.Append( RPATH = liboctbstack_env.Literal('\\$$ORIGIN')) + +if env.get('SECURED') == '1': + liboctbstack_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto']) + +if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows', 'tizenrt']: liboctbstack_env.PrependUnique(LIBS = ['connectivity_abstraction']) if with_ra_ibb: @@ -83,16 +110,31 @@ if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows']: liboctbstack_env.AppendUnique(LIBS = ['ra_xmpp']) if target_os in ['windows', 'msys_nt']: - liboctbstack_env.AppendUnique(CPPDEFINES = ['OC_EXPORT_DLL']) - liboctbstack_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi']) + # octbstack.def specifies the list of functions exported by octbstack.dll. + liboctbstack_env.Replace(WINDOWS_INSERT_DEF = ['1']) + if env.get('TEST') == '1': + liboctbstack_env.Textfile(target = 'octbstack_not_secured.def', source = [File('octbstack_product.def'), File('octbstack_test.def')]) + else: + liboctbstack_env.Textfile(target = 'octbstack_not_secured.def', source = [File('octbstack_product.def')]) + + if env.get('SECURED') == '1': + # octbstack.dll is exporting ocpmapi APIs on Windows - there is no ocpmapi.dll. + liboctbstack_env.PrependUnique(LIBS = ['ocpmapi']) + if env.get('MULTIPLE_OWNER') == '1': + liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_not_secured.def'), File('octbstack_product_secured.def'), File('octbstack_product_secured_mot.def')]) + else: + liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_not_secured.def'), File('octbstack_product_secured.def')]) + else: + liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_not_secured.def')]) + + liboctbstack_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi', 'bcrypt']) else: liboctbstack_env.AppendUnique(LIBS = ['m']) if target_os in ['tizen', 'linux']: liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid") - -if target_os not in ['android', 'arduino', 'windows', 'winrt', 'msys_nt']: - liboctbstack_env.AppendUnique(LIBS = ['pthread']) +if target_os in ['tizen']: + liboctbstack_env.ParseConfig('pkg-config --cflags --libs sqlite3') if target_os == 'arduino': liboctbstack_env.AppendUnique(CPPDEFINES = ['NDEBUG', 'WITH_ARDUINO']) @@ -105,34 +147,31 @@ if target_os in ['darwin', 'ios']: if target_os not in ['arduino', 'windows']: liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'android': - liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,liboctbstack.so']) - -if env.get('SECURED') == '1': - liboctbstack_env.AppendUnique(LIBS = ['tinydtls']) + liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,liboctbstack.so']) if env.get('LOGGING'): liboctbstack_env.AppendUnique(CPPDEFINES = ['TB_LOG']) -if env.get('DTLS_WITH_X509') == '1': - liboctbstack_env.AppendUnique(CPPDEFINES = ['__WITH_X509__']) - -if env.get('WITH_RD') == '1': - liboctbstack_env.PrependUnique(CPPPATH = ['../../service/resource-directory/include']) - liboctbstack_env.PrependUnique(LIBPATH = [env.get('BUILD_DIR') + 'service/resource-directory/include']) - liboctbstack_env.AppendUnique(CPPDEFINES = ['-DWITH_RD']) - liboctbstack_env.AppendUnique(LIBS = ['resource_directory']) - liboctbstack_env.Append(LIBS = ['c_common']) if liboctbstack_env.get('ROUTING') in ['GW', 'EP']: liboctbstack_env.Prepend(LIBS = ['routingmanager']) +if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: + if 'CLIENT' in rd_mode: + liboctbstack_env.AppendUnique(CPPDEFINES = ['RD_CLIENT']) + if 'SERVER' in rd_mode: + liboctbstack_env.AppendUnique(CPPDEFINES = ['RD_SERVER']) + if target_os in ['tizen']: + liboctbstack_env.ParseConfig('pkg-config --cflags --libs sqlite3') + else: + liboctbstack_env.AppendUnique(CPPPATH = ['#extlibs/sqlite3']) + ###################################################################### # Source files and Targets ###################################################################### OCTBSTACK_SRC = 'stack/src/' liboctbstack_src = [ - '../../extlibs/cjson/cJSON.c', '../../extlibs/timer/timer.c', OCTBSTACK_SRC + 'ocstack.c', OCTBSTACK_SRC + 'ocpayload.c', @@ -143,24 +182,40 @@ liboctbstack_src = [ OCTBSTACK_SRC + 'ocobserve.c', OCTBSTACK_SRC + 'ocserverrequest.c', OCTBSTACK_SRC + 'occollection.c', - OCTBSTACK_SRC + 'oicgroup.c', - OCTBSTACK_SRC + "rdpayload.c" + OCTBSTACK_SRC + 'oicgroup.c' ] +if target_os != 'tizenrt': + liboctbstack_src.append('../../extlibs/cjson/cJSON.c') + if with_tcp == True: liboctbstack_src.append(OCTBSTACK_SRC + 'oickeepalive.c') + liboctbstack_env.UserInstallTargetHeader('stack/include/oickeepalive.h', 'resource', 'oickeepalive.h') + +if 'SERVER' in rd_mode: + liboctbstack_src.append(OCTBSTACK_SRC + 'oicresourcedirectory.c') + if target_os not in ['tizen']: + liboctbstack_src.append('#extlibs/sqlite3/sqlite3.c') + +if target_os in ['linux']: + # Linux uses a Shared library because SCons chooses the shared library on Linux + # when only 'octbstack' is added to the LIBS. + # TODO: Switch Linux to use a Static library for testing like every other OS. + test_liboctbstack = liboctbstack_env.SharedLibrary('octbstack_test', liboctbstack_src) +else: + test_liboctbstack = liboctbstack_env.StaticLibrary('octbstack_test', liboctbstack_src) -liboctbstack_src.extend(env['cbor_files']) +octbstack_libs = Flatten(test_liboctbstack) -if target_os == 'windows': - liboctbstack_env.AppendUnique(CPPDEFINES = ['CBOR_API=__declspec(dllexport)', - 'CBOR_PRIVATE_API=__declspec(dllexport)' - ]) +if target_os in ['windows', 'msys_nt']: + # Avoid a name conflict with the octbstack.lib target of the SharedLibrary. + static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack_static', liboctbstack_src) +else: + static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src) -static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src) octbstack_libs = Flatten(static_liboctbstack) -if target_os not in ['arduino','darwin','ios'] : +if target_os not in ['arduino','darwin','ios','tizenrt'] : shared_liboctbstack = liboctbstack_env.SharedLibrary('octbstack', liboctbstack_src) octbstack_libs += Flatten(shared_liboctbstack) liboctbstack_env.UserInstallTargetHeader('stack/include/ocstack.h', 'resource', 'ocstack.h') @@ -171,3 +226,4 @@ liboctbstack_env.UserInstallTargetLib(octbstack_libs, 'octbstack') liboctbstack_env.UserInstallTargetHeader('stack/include/ocstackconfig.h', 'resource', 'ocstackconfig.h') liboctbstack_env.UserInstallTargetHeader('stack/include/octypes.h', 'resource', 'octypes.h') +liboctbstack_env.UserInstallTargetHeader('stack/include/ocpayload.h', 'resource', 'ocpayload.h')