Merge branch 'master' into windows-port

[platform/upstream/iotivity.git] / resource / provisioning / examples / SConscript

diff --git a/resource/provisioning/examples/SConscript b/resource/provisioning/examples/SConscript
index a8c259f..8e9c696 100644 (file)
--- a/resource/provisioning/examples/SConscript
+++ b/resource/provisioning/examples/SConscript
@@ -26,6 +26,9 @@ Import('env')
 lib_env = env.Clone()
 SConscript(env.get('SRC_DIR') + '/resource/third_party_libs.scons', 'lib_env')
 
+with_ra = env.get('WITH_RA')
+with_ra_ibb = env.get('WITH_RA_IBB')
+
 examples_env = lib_env.Clone()
 
 ######################################################################
@@ -36,6 +39,7 @@ examples_env.AppendUnique(CPPPATH = [
         '../../csdk/stack/include',
         '../../csdk/logger/include',
         '../../oc_logger/include',
+        '../../csdk/connectivity/api',
         '../../csdk/security/include',
         '../../csdk/security/provisioning/include',
         '../../csdk/security/provisioning/include/oxm',
@@ -49,14 +53,25 @@ if target_os not in ['windows', 'winrt']:
        # Note: 'pthread' is in libc for android. On other platform, if use
        # new gcc(>4.9?) it isn't required, otherwise, it's required
        if target_os != 'android':
-               examples_env.AppendUnique(LIBS = ['-lpthread'])
+               examples_env.AppendUnique(LIBS = ['-lpthread', '-ldl'])
 
 examples_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 examples_env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
 examples_env.PrependUnique(LIBS = ['ocprovision', 'oc', 'ocpmapi', 'octbstack',
                                     'oc_logger', 'connectivity_abstraction', 'coap'])
+if with_ra_ibb:
+       examples_env.AppendUnique(LIBS = examples_env['RALIBS'], LIBPATH = examples_env['RALIBPATH'], RPATH = examples_env['RARPATH'])
+       print "RALIBS = %s" % examples_env['RALIBS']
+       print "RALIBPATH = %s" % examples_env['RALIBPATH']
+       print "RARPATH = %s" % examples_env['RARPATH']
+       examples_env.AppendUnique(LIBS = 'wksxmppxep')
+else :
+       if with_ra:
+               examples_env.AppendUnique(LIBS = ['ra_xmpp'])
+
 if env.get('SECURED') == '1':
     examples_env.AppendUnique(LIBS = ['tinydtls'])
+    examples_env.AppendUnique(LIBS = ['timer'])
 if env.get('DTLS_WITH_X509') == '1':
        examples_env.AppendUnique(LIBS = ['CKManager'])
        examples_env.AppendUnique(LIBS = ['asn1'])
@@ -76,11 +91,12 @@ if target_os in ['darwin', 'ios']:
 ######################################################################
 provisioningclient = examples_env.Program('provisioningclient', 'provisioningclient.cpp')
 
-Alias("examples", [provisioningclient])
-env.AppendTarget('examples')
-
 src_dir = examples_env.get('SRC_DIR')
 svr_db_src_dir = src_dir + '/resource/provisioning/examples/'
 svr_db_build_dir = env.get('BUILD_DIR') +'/resource/provisioning/examples/'
-examples_env.Alias("install", examples_env.Install( svr_db_build_dir,
-                svr_db_src_dir + 'oic_svr_db_client.json'))
+
+clientjson = examples_env.Install(svr_db_build_dir, svr_db_src_dir + 'oic_svr_db_client.json')
+
+Alias("examples", [provisioningclient, clientjson])
+env.AppendTarget('examples')
+