Merge branch '1.3-rel' (27355aa8) 29/20229/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 4 Jul 2017 08:01:37 +0000 (10:01 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Tue, 4 Jul 2017 09:44:24 +0000 (09:44 +0000)
Conflicts:
  extlibs/libcoap/SConscript
  extlibs/wksxmppxep/SConscript
  resource/csdk/security/provisioning/unittest/SConscript

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I907be8be5fbe6cd7d244dd307eb443b983ba015e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
extlibs/android/sdk/SConscript
extlibs/arduino/SConscript
extlibs/wksxmppxep/SConscript
resource/csdk/security/provisioning/unittest/SConscript

Simple merge
Simple merge
@@@ -23,52 -23,58 +23,57 @@@ LIB_PATH = SRC_PAT
  WJSXMPPXEP_LIBS = ['wksxmppxep', 'm', 'crypto']
  
  if with_ra_ibb:
-       env.SConscript('#extlibs/libstrophe/SConscript')
-       if not os.path.exists(SRC_NAME):
-               raxmpp_env = Environment(ENV = os.environ)
-               c = raxmpp_env.Action(['git clone https://github.com/WorksSystems/wks_xep0047.git ' + SRC_NAME,
-                       'cd ' + SRC_NAME + ' && git checkout 8e9f42d02a0f416001065d1cddc1ab07974cef14'
 -    env.SConscript(base_dir + '/extlibs/libstrophe/SConscript')
++    env.SConscript('#extlibs/libstrophe/SConscript')
+     if not os.path.exists(SRC_NAME):
+         raxmpp_env = Environment(ENV=os.environ)
+         c = raxmpp_env.Action([
+             'git clone https://github.com/WorksSystems/wks_xep0047.git ' + SRC_NAME,
+             'cd ' + SRC_NAME + ' && git checkout 8e9f42d02a0f416001065d1cddc1ab07974cef14'
          ])
  
-               print 'Downloading', SRC_NAME ,'library ...'
-               if raxmpp_env.Execute(c):
-                       print '''
+         print 'Downloading', SRC_NAME, 'library ...'
+         if raxmpp_env.Execute(c):
+             msg = '''
  *********************************** Error: ************************************
  * Please download ra_xmpp as following:
  *     $ git clone https://github.com/WorksSystems/wksxmpp_chat.git extlibs/wksxmppxep/wksxmpp_chat
  *     $ cd extlibs/wksxmppxep/wksxmpp_chat
  *     $ git checkout 8e9f42d02a0f416001065d1cddc1ab07974cef14
  *******************************************************************************
      '''
-                       Exit(1)
-               else:
-                       print 'Download', SRC_NAME, 'library complete'
+ '''
+             Exit(msg)
+         else:
+             print 'Download', SRC_NAME, 'library complete'
  
-       if not env.GetOption('clean'):
-               print 'Building with ' + SRC_NAME
-               os.chdir(SRC_NAME)
-               if not os.path.exists('libwksxmppxep.so') :
-                       LIBSTROPHE_BASE=base_dir + '/extlibs/libstrophe/libstrophe'
-                       foo=commands.getoutput('make LIBSTROPHE_BASE=' + LIBSTROPHE_BASE + ' libraries')
-                       print foo
-               if not os.path.exists('libwksxmppxep.so') :
-                       print 'Building with ' + SRC_NAME + ' failed.'
-                       Exit(2)
-               else:
-                       foo = commands.getoutput('cp libwksxmppxep.so ' + env.get('BUILD_DIR'))
-                       print foo
-                       foo = commands.getoutput('cp libwksxmppxep.a ' + env.get('BUILD_DIR'))
-                       print foo
-       
-               print 'Building with ' + SRC_NAME + ' Completely.'
+         if not env.GetOption('clean'):
+             print 'Building with ' + SRC_NAME
+             os.chdir(SRC_NAME)
+             if not os.path.exists('libwksxmppxep.so'):
+                 LIBSTROPHE_BASE = base_dir + '/extlibs/libstrophe/libstrophe'
+                 foo = commands.getoutput('make LIBSTROPHE_BASE=' +
+                                          LIBSTROPHE_BASE + ' libraries')
+                 print foo
+             if not os.path.exists('libwksxmppxep.so'):
+                 msg = 'Building with ' + SRC_NAME + ' failed.'
+                 Exit(msg)
+             else:
+                 foo = commands.getoutput('cp libwksxmppxep.so ' + build_dir)
+                 print foo
+                 foo = commands.getoutput('cp libwksxmppxep.a ' + build_dir)
+                 print foo
 -
+             print 'Building with ' + SRC_NAME + ' Completely.'
  
-       env.PrependUnique(CPPPATH = [INC_PATH], RALIBS = WJSXMPPXEP_LIBS, RALIBPATH = [LIB_PATH], RARPATH = [LIB_PATH])
-       env.AppendUnique(LIBS = WJSXMPPXEP_LIBS, LIBPATH = [LIB_PATH])
-       env.AppendUnique(LIBS = ['boost_system', 'boost_thread'])
+         env.PrependUnique(
+             CPPPATH=[INC_PATH],
+             RALIBS=WJSXMPPXEP_LIBS,
+             RALIBPATH=[LIB_PATH],
+             RARPATH=[LIB_PATH])
+         env.AppendUnique(LIBS=WJSXMPPXEP_LIBS, LIBPATH=[LIB_PATH])
+         env.AppendUnique(LIBS=['boost_system', 'boost_thread'])
  
- if env.GetOption('clean') :
-       act = env.Action(['cd ' + SRC_PATH, 'make clean'])
-       env.Execute(act)
-       if os.path.isfile(env.get('BUILD_DIR') + '/libwksxmppxep.so'):
-               act2 = env.Action(['rm ' + env.get('BUILD_DIR') + '/libwksxmppxep.*'])
-               env.Execute(act2)
+ if env.GetOption('clean'):
+     act = env.Action(['cd ' + SRC_PATH, 'make clean'])
+     env.Execute(act)
+     if os.path.isfile(build_dir + '/libwksxmppxep.so'):
+         act2 = env.Action(['rm ' + build_dir + '/libwksxmppxep.*'])
+         env.Execute(act2)
@@@ -189,14 -201,14 +201,15 @@@ else
  ######################################################################
  # Source files and Targets
  ######################################################################
- unittest_src = ['pmutilitytest.cpp',
-                 'secureresourceprovider.cpp',
-                 'provisioningdatabasemanager.cpp',
-                 'ocprovisioningmanager.cpp',
-                 'credentialgeneratortest.cpp',
-                 'otmunittest.cpp'
-                 ]
 +
+ unittest_src = [
+     'pmutilitytest.cpp',
+     'secureresourceprovider.cpp',
+     'provisioningdatabasemanager.cpp',
+     'ocprovisioningmanager.cpp',
+     'credentialgeneratortest.cpp',
+     'otmunittest.cpp',
+ ]
  
  tests = sptest_env.Program(unittest_bin, unittest_src)
  server = sptest_env.Program(server_bin, ['sampleserver.cpp'])