Merge branch '1.4-rel' (455c136) 07/26807/2
authorPhilippe Coval <p.coval@samsung.com>
Thu, 13 Sep 2018 14:34:20 +0000 (16:34 +0200)
committerPhilippe Coval <p.coval@samsung.com>
Thu, 13 Sep 2018 14:36:21 +0000 (16:36 +0200)
Relate-to:
      I923216cf283e97eada4b600d5ebf8f5360c9e317
      I3de75a1485c47fd54ea46da2f3079a6e5fae8084
      I6e9296de9b22858f831ee503587fda51323ac902
      Iead0efa96b95f026b6a5b20731c8069f688c9483
      Ib4f04677cdc6951a0a9505efbd6ab47a7a79288b
      Ic88f9bae3137c439518901084d77285ace964d99
      I6b6320e8a6444a43c6400527f2f982a39a3d9128
      Ibaf2c7d0b9daad7248b2f226da164a7a301dc526
      I4b820e50158e34a94d84195e4979ada6fefff190
      I91c44d9e3e8af731175337bc80afa13a44222d6c
      I5c10141d76c1d2a1ce3efc656990a628dfd6a246

Change-Id: Ie30199897cd6fe64e2fd7a66126a3c87d25d9c1d
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
auto_build.py
resource/csdk/connectivity/inc/catcpadapter.h
resource/docs/c-doc/devdocs.doxyfile

diff --cc auto_build.py
@@@ -506,27 -445,26 +506,29 @@@ def build_tizen(flag, scons_options)
      print ("*********** Build for Tizen Easy-Setup  sample *************")
      build_options['ROUTING'] = 'EP'
      build_options['ES_TARGET_ENROLLEE'] = 'tizen'
 -    build_extra_options = "-f service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/tizen/SConscript " + extra_option_str
 +    build_extra_options = "-f service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/tizen/SConscript " + scons_options
      call_scons(build_options, build_extra_options)
+     build_options['MULTIPLE_OWNER'] = 1
+     call_scons(build_options, build_extra_options)
  
 -def build_tizen_secured(flag, extra_option_str):
 -    build_tizen(flag, extra_option_str + " SECURED=1")
  
 -def build_tizen_unsecured(flag, extra_option_str):
 -    build_tizen(flag, extra_option_str + " SECURED=0")
 +def build_tizen_secured(flag, scons_options):
 +    build_tizen(flag, scons_options + " SECURED=1")
 +
 +
 +def build_tizen_unsecured(flag, scons_options):
 +    build_tizen(flag, scons_options + " SECURED=0")
 +
  
  # Mac OS and iOS
 -def build_darwin(flag, extra_option_str):
 +def build_darwin(flag, scons_options):
      print ("*********** Build for OSX *************")
      build_options = {
 -                        'TARGET_OS':'darwin',
 -                        'SYS_VERSION':'10.9',
 -                        'RELEASE':flag,
 -                    }
 -    call_scons(build_options, extra_option_str)
 +        'TARGET_OS': 'darwin',
 +        'SYS_VERSION': '10.9',
 +        'RELEASE': flag,
 +    }
 +    call_scons(build_options, scons_options)
  
      print ("*********** Build for IOS i386 *************")
      build_options = {
@@@ -140,7 -135,10 +140,9 @@@ INPUT                  = devdox 
                           ../../c_common/windows/include \
                           ../../c_common/windows/src \
                           ../../c_common/ocrandom/include \
-                          ../../c_common/ocrandom/src
+                          ../../c_common/ocrandom/src \
+                          ../../c_common/oc_refcounter/include \
+                          ../../c_common/oc_refcounter/src
 -
  INPUT_ENCODING         = UTF-8
  FILE_PATTERNS          =
  RECURSIVE              = YES