X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build_common%2FSConscript;h=77d39dd7dc0c0b3f536607e08b3b183e482015d2;hb=fa393dc92a9ea0e8809d4474d54d916e845b2d0e;hp=f1044d7d9fa2eb17f1dafa34a7acd51efb0c6c29;hpb=a214f7d5b1f3c97e4ba731577e7297f14c5ef8b9;p=platform%2Fupstream%2Fiotivity.git diff --git a/build_common/SConscript b/build_common/SConscript index f1044d7..77d39dd 100644 --- a/build_common/SConscript +++ b/build_common/SConscript @@ -1,3 +1,4 @@ +# -*- mode: python; python-indent-offset: 4; indent-tabs-mode: nil -*- ## # This script includes generic build options: # release/debug, target os, target arch, cross toolchain, build environment etc @@ -5,22 +6,23 @@ import os import platform +project_version = '1.2.0' + # Map of host os and allowed target os (host: allowed target os) host_target_map = { 'linux': ['linux', 'android', 'arduino', 'yocto', 'tizen'], - 'windows': ['windows', 'winrt', 'android', 'arduino'], + 'windows': ['windows', 'android', 'arduino'], 'darwin': ['darwin', 'ios', 'android', 'arduino'], 'msys_nt' :['msys_nt'], } # Map of os and allowed archs (os: allowed archs) os_arch_map = { - 'linux': ['x86', 'x86_64', 'arm', 'arm64'], - 'tizen': ['x86', 'x86_64', 'arm', 'arm64', 'armeabi-v7a'], + 'linux': ['x86', 'x86_64', 'arm', 'arm-v7a', 'arm64'], + 'tizen': ['x86', 'x86_64', 'arm', 'arm-v7a', 'armeabi-v7a', 'arm64'], 'android': ['x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard', 'arm64-v8a'], 'windows': ['x86', 'amd64', 'arm'], 'msys_nt':['x86', 'x86_64'], - 'winrt': ['arm'], 'darwin': ['i386', 'x86_64'], 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'], 'arduino': ['avr', 'arm'], @@ -30,7 +32,7 @@ os_arch_map = { host = platform.system().lower() # the host string contains version of windows. 6.3, 6.4, 10.0 which is 8.0, 8.1, and 10 respectively. -# Let's canonicalize the msys_nt-XX.X system name by stripping version off. +# Let's canonicalize the msys_nt-XX.X system name by stripping version off. if 'msys_nt' in host: host = 'msys_nt' @@ -73,7 +75,6 @@ else: logging_default = (release_mode == False) - ###################################################################### # Common build options (release, target os, target arch) ###################################################################### @@ -87,8 +88,10 @@ help_vars.Add(EnumVariable('TARGET_OS', 'Target platform', host, host_target_map help_vars.Add(BoolVariable('WITH_RA', 'Build with Remote Access module', False)) help_vars.Add(BoolVariable('WITH_TCP', 'Build with TCP adapter', False)) -help_vars.Add(EnumVariable('WITH_RD', 'Build including Resource Directory', '0', allowed_values=('0', '1'))) -help_vars.Add(BoolVariable('WITH_CLOUD', 'Build including Cloud client sample', False)) +help_vars.Add(BoolVariable('WITH_PROXY', 'Build with CoAP-HTTP Proxy', False)) +help_vars.Add(ListVariable('WITH_MQ', 'Build with MQ publisher/broker', 'OFF', ['OFF', 'SUB', 'PUB', 'BROKER'])) +help_vars.Add(BoolVariable('WITH_CLOUD', 'Build including AccountManager class and Cloud Client sample', False)) +help_vars.Add(ListVariable('RD_MODE', 'Resource Directory build mode', 'CLIENT', ['CLIENT', 'SERVER'])) help_vars.Add(BoolVariable('SIMULATOR', 'Build with simulator module', False)) @@ -112,12 +115,6 @@ help_vars.AddVariables(('DEVICE_NAME', 'Network display name for device (For Ard help_vars.Add(PathVariable('ANDROID_NDK', 'Android NDK path', None, PathVariable.PathAccept)) help_vars.Add(PathVariable('ANDROID_HOME', 'Android SDK path', None, PathVariable.PathAccept)) help_vars.Add(PathVariable('ANDROID_GRADLE', 'Gradle binary file', None, PathVariable.PathIsFile)) -#ES_TARGET_ENROLLEE is for specifying what is our target enrollee (Arduino or rest of platforms which support Multicast) -help_vars.Add(EnumVariable('ES_TARGET_ENROLLEE', 'Target Enrollee', 'arduino', allowed_values=('arduino', 'tizen', 'linux'))) -#ES_ROLE is for specifying the role (Enrollee or Mediator) for which scons is being executed -help_vars.Add(EnumVariable('ES_ROLE', 'Target build mode', 'mediator', allowed_values=('mediator', 'enrollee'))) -#ES_SOFT_MODE is for specifying MODE (Mode 1 : Enrollee with Soft AP or Mode 2 : Mediator with Soft AP) -help_vars.Add(EnumVariable('ES_SOFTAP_MODE', 'Target build mode', 'ENROLLEE_SOFTAP', allowed_values=('ENROLLEE_SOFTAP', 'MEDIATOR_SOFTAP'))) AddOption('--prefix', dest='prefix', @@ -312,30 +309,31 @@ Export('env') ###################################################################### pc_file = env.get('SRC_DIR') + '/iotivity.pc.in' -if env.get('ROUTING') == 'GW': - routing_define = 'ROUTING_GATEWAY' -elif env.get('ROUTING') == 'EP': - routing_define = 'ROUTING_EP' - user_prefix = env.get('PREFIX') user_lib = env.get('LIB_INSTALL_DIR') + +if not user_prefix: + user_prefix = env.get('BUILD_DIR').encode('string_escape') + if not user_lib: - user_lib = '$${prefix}/lib' - -if user_prefix: - pc_vars = {'\@PREFIX\@': user_prefix, - '\@EXEC_PREFIX\@':user_prefix, - '\@VERSION\@': '1.0.1', - '\@LIB_INSTALL_DIR\@': user_lib, - '\@ROUTING_DEFINE\@': routing_define - } -else: - pc_vars = {'\@PREFIX\@': env.get('BUILD_DIR').encode('string_escape'), - '\@EXEC_PREFIX\@': env.get('BUILD_DIR').encode('string_escape'), - '\@VERSION\@': '1.0.1', - '\@LIB_INSTALL_DIR\@': user_lib, - '\@ROUTING_DEFINE\@': routing_define - } + user_lib = '$${prefix}/lib' + +defines = [] +if env.get('LOGGING'): + defines.append('-DTB_LOG=1') + +if env.get('ROUTING') == 'GW': + defines.append('-DROUTING_GATEWAY=1') +elif env.get('ROUTING') == 'EP': + defines.append('-DROUTING_EP=1') + +pc_vars = { + '\@VERSION\@': project_version, + '\@PREFIX\@': user_prefix, + '\@EXEC_PREFIX\@': user_prefix, + '\@LIB_INSTALL_DIR\@': user_lib, + '\@DEFINES\@': " ".join(defines) +} env.Substfile(pc_file, SUBST_DICT = pc_vars) @@ -374,6 +372,8 @@ if target_os == "yocto": env[tool] = os.path.join(path, os.environ[tool]) break env['CROSS_COMPILE'] = target_prefix[:len(target_prefix) - 1] + if os.environ['LDFLAGS'] != None: + env.AppendUnique(LINKFLAGS = Split(os.environ['LDFLAGS'])) except: print "ERROR in Yocto cross-toolchain environment" Exit(1) @@ -397,8 +397,7 @@ if target_os == "yocto": env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__linux__', '_GNU_SOURCE']) env.AppendUnique(CFLAGS = ['-std=gnu99']) env.AppendUnique(CCFLAGS = ['-Wall', '-Wextra', '-fPIC']) - env.AppendUnique(LINKFLAGS = ['-ldl', '-lpthread']) - env.AppendUnique(LIBS = ['uuid']) + env.AppendUnique(LIBS = ['dl', 'pthread', 'uuid']) Export('env') else: '''