Merge remote branch '1.3-rel'(38203e6) 47/22647/2
authorGeorge Nash <george.nash@intel.com>
Fri, 29 Sep 2017 21:06:27 +0000 (14:06 -0700)
committerGeorge Nash <george.nash@intel.com>
Fri, 29 Sep 2017 21:06:27 +0000 (14:06 -0700)
Relate-to:
https://gerrit.iotivity.org/gerrit/22591/
https://gerrit.iotivity.org/gerrit/22515/
https://gerrit.iotivity.org/gerrit/22585/
https://gerrit.iotivity.org/gerrit/22627/
https://gerrit.iotivity.org/gerrit/22399/
https://gerrit.iotivity.org/gerrit/22579/
https://gerrit.iotivity.org/gerrit/22563/
https://gerrit.iotivity.org/gerrit/21327/
https://gerrit.iotivity.org/gerrit/22571/
https://gerrit.iotivity.org/gerrit/22555/
https://gerrit.iotivity.org/gerrit/22611/
https://gerrit.iotivity.org/gerrit/22595/
https://gerrit.iotivity.org/gerrit/22409/
https://gerrit.iotivity.org/gerrit/22557/

Conflicts:
  resource/third_party_libs.scons
  service/easy-setup/enrollee/unittests/ESEnrolleeTest.cpp
  service/notification/SConscript
  service/notification/cpp-wrapper/consumer/SConscript
  service/notification/cpp-wrapper/examples/linux/SConscript
  service/notification/cpp-wrapper/provider/SConscript
  service/notification/examples/linux/SConscript
  service/third_party_libs.scons

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: Ie1f359fb1793bc9d746d21fab5865b98e0b5c48d
Signed-off-by: George Nash <george.nash@intel.com>
54 files changed:
1  2 
bridging/common/SConscript
bridging/common/messageHandler.cpp
bridging/mini_plugin_manager/SConscript
bridging/mpm_client/SConscript
bridging/plugins/hue_plugin/SConscript
bridging/plugins/lifx_plugin/SConscript
bridging/plugins/lyric_plugin/SConscript
bridging/plugins/nest_plugin/SConscript
build_common/SConscript
plugins/src/SConscript
plugins/zigbee_wrapper/src/SConscript
resource/csdk/include/octypes.h
resource/csdk/resource-directory/SConscript
resource/csdk/security/provisioning/sample/SConscript
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/amaclresource.c
resource/csdk/security/src/certhelpers.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/crlresource.c
resource/csdk/security/src/csrresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/tool/SConscript
resource/csdk/security/tool/json2cbor.c
resource/csdk/stack/SConscript
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
resource/csdk/stack/src/ocpayloadconvert.c
resource/csdk/stack/src/ocpayloadparse.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c
resource/examples/oic_svr_db_client.dat
resource/examples/oic_svr_db_server.dat
resource/provisioning/examples/SConscript
resource/third_party_libs.scons
service/easy-setup/mediator/richsdk/SConscript
service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
service/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp
service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
service/notification/SConscript
service/notification/cpp-wrapper/consumer/SConscript
service/notification/cpp-wrapper/examples/linux/SConscript
service/notification/cpp-wrapper/provider/SConscript
service/notification/examples/linux/SConscript
service/simulator/SConscript
service/third_party_libs.scons
tools/tizen/iotivity.spec

Simple merge
Simple merge
@@@ -43,9 -46,8 +43,8 @@@ manager_env.PrependUnique(CPPPATH=
  ])
  
  if target_os not in ['arduino', 'windows']:
 -        manager_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
 +    manager_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
  
- manager_env.AppendUnique(RPATH=[manager_env.get('BUILD_DIR')])
  manager_env.PrependUnique(LIBS=['mpmcommon'])
  
  #####################################################################
@@@ -46,16 -46,8 +46,14 @@@ mpmclient_env.PrependUnique(CPPPATH=
  mpmclient_env.PrependUnique(LIBS=['minipluginmanager'])
  mpmclient_env.AppendUnique(LIBS=['pthread'])
  mpmclient_env.AppendUnique(LIBS=[
 -    'm', 'octbstack', 'ocsrm', 'mpmcommon', 'connectivity_abstraction', 'coap', 'curl'
 +    'm',
 +    'octbstack',
 +    'ocsrm',
 +    'mpmcommon',
 +    'connectivity_abstraction',
 +    'coap',
 +    'curl'
  ])
- mpmclient_env.AppendUnique(
-     RPATH=[os.path.join(env.get('BUILD_DIR'), 'bridging', 'plugins')])
  
  if target_os in ['linux', 'tizen', 'yocto']:
      mpmclient_env.AppendUnique(LIBS = ['rt'])
@@@ -65,14 -65,11 +65,12 @@@ if 'g++' in lifx_env.get('CXX')
      lifx_env.AppendUnique(
          CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
  
- lifx_env.AppendUnique(RPATH=[lifx_env.get('BUILD_DIR')])
  lifx_env['LINKFLAGS'] = maskFlags(env['LINKFLAGS'])
 -lifx_env.AppendUnique(LINKFLAGS=['-Wl,--allow-shlib-undefined'])
  lifx_env.AppendUnique(LINKFLAGS=[
 +    '-Wl,--allow-shlib-undefined',
      '-Wl,--whole-archive',
 -    lifx_env.get('BUILD_DIR') + 'libmpmcommon.a', '-Wl,-no-whole-archive'
 +    lifx_env.get('BUILD_DIR') + 'libmpmcommon.a',
 +    '-Wl,-no-whole-archive',
  ])
  
  lifx_env.AppendUnique(LIBS=[
@@@ -67,14 -67,11 +67,12 @@@ if 'g++' in lyric_env.get('CXX')
      lyric_env.AppendUnique(
          CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
  
- lyric_env.AppendUnique(RPATH=[lyric_env.get('BUILD_DIR')])
  lyric_env['LINKFLAGS'] = maskFlags(env['LINKFLAGS'])
 -lyric_env.AppendUnique(LINKFLAGS=['-Wl,--allow-shlib-undefined'])
  lyric_env.AppendUnique(LINKFLAGS=[
 +    '-Wl,--allow-shlib-undefined',
      '-Wl,--whole-archive',
 -    lyric_env.get('BUILD_DIR') + 'libmpmcommon.a', '-Wl,-no-whole-archive'
 +    lyric_env.get('BUILD_DIR') + 'libmpmcommon.a',
 +    '-Wl,-no-whole-archive'
  ])
  
  lyric_env.AppendUnique(LIBS=[
@@@ -5,9 -5,8 +5,9 @@@
  ##
  import os
  import platform
 +import re
  
- project_version = '1.3.0'
+ project_version = '1.3.1'
  
  # Map of build host to possible target os
  host_target_map = {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1f58a4c,dc9fd24..6856fbc
Binary files differ
index 48c8eb9,ca853b3..b62f509
Binary files differ
@@@ -36,17 -36,18 +36,18 @@@ src_dir = env.get('SRC_DIR'
  # Check dependent packages (Linux only)
  ######################################################################
  if target_os in ['linux']:
-     if not env.GetOption('help'):
-         if not target_arch == platform.machine():
+     if not env.GetOption('help') and not env.GetOption('clean'):
+         if target_arch != platform.machine() and \
+            not (target_arch == 'x86' and platform.machine() in ('i586', 'i686')):
 -            print '''
 +            print('''
  *********************************** Warning **********************************
  * You are trying cross build, please make sure cross (%s) libraries are
  * installed!
  ******************************************************************************
 -''' % target_arch
 +''' % target_arch)
  
-         conf = Configure(lib_env)
-         conf.Finish()
+     conf = Configure(lib_env)
+     conf.Finish()
  
  ######################################################################
  # The path of third party libraries binary
@@@ -61,9 -62,9 +62,9 @@@ if target_os == 'android'
  *********************************** Warning ***********************************
  * currently only x86, x86_64, armeabi, armeabi-v7a libraries are available!
  *******************************************************************************
 -'''
 +''')
      else:
-         # Too much boost warning, suppress the warning
+         # Boost warnings too noisy, suppress
          lib_env.AppendUnique(CCFLAGS=['-w'])
  
  elif target_os in ['windows']:
  import platform
  Import('env')
  
- if env.get('RELEASE'):
-     env.AppendUnique(CCFLAGS=['-Os'])
-     env.AppendUnique(CPPDEFINES=['NDEBUG'])
- else:
-     env.AppendUnique(CCFLAGS=['-g'])
- if env.get('LOGGING'):
-     env.AppendUnique(CPPDEFINES=['TB_LOG'])
  lib_env = env.Clone()
 -SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 +SConscript('#service/third_party_libs.scons', 'lib_env')
  notification_env = lib_env.Clone()
  
+ if notification_env.get('RELEASE'):
+     notification_env.AppendUnique(CCFLAGS=['-Os'])
+ else:
+     notification_env.AppendUnique(CCFLAGS=['-g'])
  target_os = env.get('TARGET_OS')
  
  ######################################################################
  import platform
  Import('env')
  
- if env.get('RELEASE'):
-     env.AppendUnique(CCFLAGS=['-Os'])
-     env.AppendUnique(CPPDEFINES=['NDEBUG'])
- else:
-     env.AppendUnique(CCFLAGS=['-g'])
- if env.get('LOGGING'):
-     env.AppendUnique(CPPDEFINES=['TB_LOG'])
  lib_env = env.Clone()
 -SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 +SConscript('#service/third_party_libs.scons', 'lib_env')
  notification_env = lib_env.Clone()
  
  target_os = env.get('TARGET_OS')
  import platform
  Import('env')
  
- if env.get('RELEASE'):
-     env.AppendUnique(CCFLAGS=['-Os'])
-     env.AppendUnique(CPPDEFINES=['NDEBUG'])
- else:
-     env.AppendUnique(CCFLAGS=['-g'])
- if env.get('LOGGING'):
-     env.AppendUnique(CPPDEFINES=['TB_LOG'])
  lib_env = env.Clone()
 -SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 +SConscript('#service/third_party_libs.scons', 'lib_env')
  notification_env = lib_env.Clone()
  
  target_os = env.get('TARGET_OS')
Simple merge
@@@ -39,29 -39,31 +39,31 @@@ resource_path = src_dir + '/resource
  ######################################################################
  if target_os in ['linux']:
      if not env.GetOption('help') and not env.GetOption('clean'):
-         if target_arch != platform.machine():
+         if target_arch != platform.machine() and \
+            not (target_arch == 'x86' and platform.machine() in ('i586', 'i686')):
 -            print '''
 +            print('''
  *********************************** Warning ***********************************
- * You are trying cross build, please make sure (%s) version libraries are
- * installed!                                                                  *
+ * You are trying cross build, please make sure cross (%s) libraries are
+ * installed!
  *******************************************************************************
 -''' % target_arch
 +''' % target_arch)
-         #Test Coverage Flags and Library (if RELEASE=0)
-         if not env.get('RELEASE'):
-             conf = Configure(lib_env.Clone(LIBS=['gcov']))
-         else:
-             conf = Configure(lib_env.Clone(LIBS=[]))
  
-         if target_os not in ['tizen']:
-             if not conf.CheckLib('boost_thread', language='C++'):
-                 msg = 'Did not find boost_thread, exiting!'
-                 Exit(msg)
+     #Test Coverage Flags and Library (if RELEASE=0)
+     if not env.get('RELEASE'):
+         conf = Configure(lib_env.Clone(LIBS=['gcov']))
+     else:
+         conf = Configure(lib_env.Clone(LIBS=[]))
+     if target_os not in ['tizen']:
+         if not conf.CheckLib('boost_thread', language='C++'):
+             msg = 'Did not find boost_thread, exiting!'
+             Exit(msg)
  
-             if not conf.CheckLib('boost_system', language='C++'):
-                 msg = 'Did not find boost_system, exiting!'
-                 Exit(msg)
+         if not conf.CheckLib('boost_system', language='C++'):
+             msg = 'Did not find boost_system, exiting!'
+             Exit(msg)
  
-         conf.Finish()
+     conf.Finish()
  
  ######################################################################
  # The 'include' path of external libraries
@@@ -87,9 -89,9 +89,9 @@@ if target_os == 'android'
  *********************************** Warning ***********************************
  * current only x86, x86_64, armeabi, armeabi-v7a libraries are provided!      *
  *******************************************************************************
 -'''
 +''')
      else:
-         # Too much boost warning, suppress the warning
+         # Boost warnings too noisy, suppress
          lib_env.AppendUnique(CCFLAGS=['-w'])
  
  elif target_os == 'ios':
Simple merge