Commit 2262cc39 authored by Mats Wichmann's avatar Mats Wichmann Committed by Phil Coval

be more pythonic: 4-space indent, no tabs, some pep8 changes

Change-Id: I6c2b42a0b3a411c7d9693eaeeb6ae05eb06ef9c8
Signed-off-by: default avatarMats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15961Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: default avatarPhil Coval <philippe.coval@osg.samsung.com>
parent 9b06239a
......@@ -21,7 +21,7 @@
######################################################################
# This script manages third party libraries
#
#Note: The paths must keep consistent with oic-resource
# Note: The paths must keep consistent with oic-resource
######################################################################
import os
import platform
......@@ -38,68 +38,65 @@ resource_path = src_dir + '/resource'
# Check dependent packages (Linux only)
######################################################################
if target_os in ['linux']:
if (not env.GetOption('help')) and (not env.GetOption('clean')):
if not target_arch == platform.machine():
print '''
if not env.GetOption('help') and not env.GetOption('clean'):
if target_arch != platform.machine():
print '''
*********************************** Warning ***********************************
* You are trying cross build, please make sure (%s) version libraries are
* installed! *
* installed! *
*******************************************************************************
''' % target_arch
conf = Configure(lib_env.Clone(LIBS = []))
conf = Configure(lib_env.Clone(LIBS=[]))
if target_os not in ['tizen'] and not conf.CheckLib('boost_thread', language='C++'):
print 'Did not find boost_thread, exiting!'
Exit(1)
if target_os not in ['tizen'] and not conf.CheckLib('boost_thread', language='C++'):
print 'Did not find boost_thread, exiting!'
Exit(1)
if target_os not in ['tizen'] and not conf.CheckLib('boost_system', language='C++'):
print 'Did not find boost_system, exiting!'
Exit(1)
if target_os not in ['tizen'] and not conf.CheckLib('boost_system', language='C++'):
print 'Did not find boost_system, exiting!'
Exit(1)
conf.Finish()
conf.Finish()
######################################################################
# The 'include' path of external libraries
######################################################################
lib_env.AppendUnique(CPPPATH = [
resource_path ,
resource_path + '/include' ,
resource_path + '/oc_logger/include',
resource_path + '/csdk/include',
resource_path + '/csdk/stack/include',
resource_path + '/c_common/ocrandom/include',
resource_path + '/csdk/logger/include'
])
lib_env.AppendUnique(CPPPATH=[
resource_path, resource_path + '/include',
resource_path + '/oc_logger/include', resource_path + '/csdk/include',
resource_path + '/csdk/stack/include',
resource_path + '/c_common/ocrandom/include',
resource_path + '/csdk/logger/include'
])
######################################################################
# The path of third party libraries binary
######################################################################
if target_os == 'android':
if target_arch == 'armeabi-v7a-hard':
target_arch = 'armeabi-v7a'
if target_arch == 'armeabi-v7a-hard':
target_arch = 'armeabi-v7a'
if target_arch not in ['x86', 'x86_64', 'armeabi', 'armeabi-v7a']:
if not env.GetOption('help') and not env.GetOption('clean'):
print '''
if target_arch not in ['x86', 'x86_64', 'armeabi', 'armeabi-v7a']:
if not env.GetOption('help') and not env.GetOption('clean'):
print '''
*********************************** Warning ***********************************
* current only x86, x86_64, armeabi, armeabi-v7a libraries are provided! *
*******************************************************************************
'''
else:
# Too much boost warning, suppress the warning
lib_env.AppendUnique(CCFLAGS = ['-w'])
else:
# Too much boost warning, suppress the warning
lib_env.AppendUnique(CCFLAGS=['-w'])
elif target_os == 'ios':
lib_env.AppendUnique(FRAMEWORKPATH = [src_dir + '/extlibs/boost/ios/framework'])
lib_env.AppendUnique(FRAMEWORKS = ['boost'])
lib_env.AppendUnique(FRAMEWORKPATH=[src_dir + '/extlibs/boost/ios/framework'])
lib_env.AppendUnique(FRAMEWORKS=['boost'])
elif target_os == 'darwin':
lib_env.AppendUnique(CPPPATH = ['/usr/local/include'])
lib_env.AppendUnique(LIBPATH = ['/usr/local/lib'])
lib_env.AppendUnique(CPPPATH=['/usr/local/include'])
lib_env.AppendUnique(LIBPATH=['/usr/local/lib'])
elif target_os == 'windows':
boost_path = os.path.join(src_dir,'extlibs','boost','boost')
lib_env.AppendUnique(CPPPATH = [boost_path])
boost_path = os.path.join(src_dir, 'extlibs', 'boost', 'boost')
lib_env.AppendUnique(CPPPATH=[boost_path])
Import('env')
lib_env.AppendUnique(LIBPATH = env.get('BUILD_DIR'))
lib_env.AppendUnique(LIBPATH=env.get('BUILD_DIR'))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment