import os
import platform
-project_version = '1.2.0'
+project_version = '1.2.1'
# Map of host os and allowed target os (host: allowed target os)
host_target_map = {
# Map of os and allowed archs (os: allowed archs)
os_arch_map = {
- 'linux': ['x86', 'x86_64', 'arm', 'arm-v7a', 'arm64'],
+ 'linux': ['x86', 'x86_64', 'arm', 'arm-v7a', 'armeabi-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'],
'darwin': ['i386', 'x86_64'],
'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'],
'arduino': ['avr', 'arm'],
- 'yocto': ['i586', 'x86_64', 'arm', 'powerpc', 'powerpc64', 'mips', 'mipsel'],
+ 'yocto': ['i586', 'i686', 'x86_64', 'arm', 'aarch64', 'powerpc', 'powerpc64', 'mips', 'mipsel'],
}
host = platform.system().lower()
# Get the device name. This name can be used as network display name wherever possible
device_name = ARGUMENTS.get('DEVICE_NAME', "OIC-DEVICE")
+default_with_upstream_libcoap = 0
+
if ARGUMENTS.get('TEST'):
logging_default = False
else:
release_mode = True
logging_default = (release_mode == False)
+# targets that do not support the DTLS build (SECURED=1 build option)
+targets_without_dtls_support = ['arduino'];
+if ARGUMENTS.get('SECURED') == '1' and target_os in targets_without_dtls_support:
+ print "\nError: DTLS not supported on target os: %s MUST build with SECURED=0\n" % (target_os)
+ Exit(1)
######################################################################
# Common build options (release, target os, target arch)
help_vars.Add(EnumVariable('TARGET_ARCH', 'Target architecture', default_arch, os_arch_map[target_os]))
help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '0', allowed_values=('0', '1')))
-help_vars.Add(EnumVariable('DTLS_WITH_X509', 'DTLS with X.509 support', '0', allowed_values=('0', '1')))
+help_vars.Add(EnumVariable('MULTIPLE_OWNER', 'Enable multiple owner', '0', allowed_values=('0', '1')))
help_vars.Add(EnumVariable('TEST', 'Run unit tests', '0', allowed_values=('0', '1')))
help_vars.Add(BoolVariable('LOGGING', 'Enable stack logging', logging_default))
help_vars.Add(BoolVariable('UPLOAD', 'Upload binary ? (For Arduino)', require_upload))
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))
+help_vars.Add(EnumVariable('WITH_UPSTREAM_LIBCOAP', 'Use latest stable version of LibCoAP downloaded from github', default_with_upstream_libcoap, allowed_values=('0','1')))
AddOption('--prefix',
dest='prefix',
elif env.get('ROUTING') == 'EP':
defines.append('-DROUTING_EP=1')
+libs = []
+if env.get('WITH_TCP'):
+ defines.append('-DTCP_ADAPTER=1')
+ if env.get('SECURED') == '1':
+ defines.append('-D__WITH_TLS__=1')
+
+if env.get('SECURED') == '1':
+ libs.append('-locpmapi')
+ defines.append('-D_WITH_DTLS_=1')
+
pc_vars = {
'\@VERSION\@': project_version,
'\@PREFIX\@': user_prefix,
'\@EXEC_PREFIX\@': user_prefix,
'\@LIB_INSTALL_DIR\@': user_lib,
- '\@DEFINES\@': " ".join(defines)
+ '\@DEFINES\@': " ".join(defines),
+ '\@LIBS\@': " ".join(libs)
}
env.Substfile(pc_file, SUBST_DICT = pc_vars)