X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fprovisioning%2FSConscript;h=25d067c1ab9b71f53404fd50edfe8c10c2319946;hb=8229635f6d207516ccbbdf23b13be164e0fc1787;hp=a7c035d10bb46dcd6d3cc6b0fd99f2502232c12b;hpb=01be9765a95ede47003777ee576fe9a4de4229e5;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/provisioning/SConscript b/resource/provisioning/SConscript
index a7c035d..25d067c 100644
--- a/resource/provisioning/SConscript
+++ b/resource/provisioning/SConscript
@@ -20,33 +20,55 @@
 
 Import('env')
 
-ocprovision_env = env.Clone()
+lib_env = env.Clone()
+SConscript(lib_env.get('SRC_DIR') + '/resource/third_party_libs.scons', 'lib_env')
+
+ocprovision_env = lib_env.Clone()
 
 ######################################################################
 # Build flags
 ######################################################################
+with_upstream_libcoap = ocprovision_env.get('WITH_UPSTREAM_LIBCOAP')
+if with_upstream_libcoap == '1':
+	# For bring up purposes only, we manually copy the forked version to where the unforked version is downloaded.
+	ocprovision_env.AppendUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])
+else:
+	# For bring up purposes only, the forked version will live here.
+	ocprovision_env.AppendUnique(CPPPATH = ['../csdk/connectivity/lib/libcoap-4.1.1/include'])
+
 ocprovision_env.AppendUnique(CPPPATH = [
 		'../include/',
-        '../csdk/stack/include',
-        '../csdk/logger/include',
-        '../oc_logger/include',
+		'../csdk/stack/include',
+		'../csdk/logger/include',
+		'../oc_logger/include',
+		'../csdk/connectivity/api',
 		'../csdk/security/include',
+		'../csdk/connectivity/inc/pkix',
 		'../csdk/security/provisioning/include',
 		'../csdk/security/provisioning/include/oxm',
-		'../csdk/security/provisioning/include/internal'
+		'../csdk/security/provisioning/include/internal',
+		'../csdk/security/provisioning/include/cloud',
+        '../csdk/connectivity/lib/libcoap-4.1.1/',
+        '../../extlibs/cjson/',
+        '../../extlibs/mbedtls/mbedtls/include'
 		])
 
-target_os = env.get('TARGET_OS')
-if target_os not in ['windows', 'winrt']:
+target_os = ocprovision_env.get('TARGET_OS')
+if target_os not in ['windows']:
 	ocprovision_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-fPIC'])
 
 if target_os == 'android':
 	ocprovision_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-	ocprovision_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-	ocprovision_env.AppendUnique(LIBS = ['ocspapi', 'octbstack', 'oc_logger', 'boost_thread', 'gnustl_shared', 'log'])
+	ocprovision_env.AppendUnique(LIBPATH = [ocprovision_env.get('BUILD_DIR')])
+	ocprovision_env.AppendUnique(LIBS = ['oc', 'octbstack', 'ocpmapi', 'oc_logger', 'boost_thread', 'gnustl_shared', 'log'])
+	ocprovision_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libocprovision.so'])
+
+if target_os in ['linux', 'tizen']:
+	ocprovision_env.AppendUnique(LIBPATH = [ocprovision_env.get('BUILD_DIR')])
+        ocprovision_env.AppendUnique(LIBS = ['oc', 'octbstack', 'ocpmapi', 'oc_logger', 'boost_thread'])
 
 if target_os in ['darwin', 'ios']:
-	ocprovision_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+	ocprovision_env.AppendUnique(LIBPATH = [ocprovision_env.get('BUILD_DIR')])
 	ocprovision_env.AppendUnique(LIBS = ['octbstack', 'oc_logger'])
 
 ######################################################################
@@ -56,8 +78,19 @@ ocprovision_src = [
 		'src/OCProvisioningManager.cpp'
 	]
 
-ocprovision = ocprovision_env.StaticLibrary('ocprovision', ocprovision_src)
+if ocprovision_env.get('WITH_TCP') == True:
+	ocprovision_src = ocprovision_src + [
+	'src/OCCloudProvisioning.cpp'
+	]
+        ocprovision_env.UserInstallTargetHeader('../include/OCCloudProvisioning.hpp', 'resource', 'OCCloudProvisioning.hpp')
+
+if target_os not in ['darwin', 'ios']:
+    ocprovision = ocprovision_env.SharedLibrary('ocprovision', ocprovision_src)
+else:
+    ocprovision = ocprovision_env.StaticLibrary('ocprovision', ocprovision_src)
 ocprovision_env.InstallTarget(ocprovision, 'libocprovision')
+ocprovision_env.UserInstallTargetLib(ocprovision, 'libocprovision')
+ocprovision_env.UserInstallTargetHeader('../include/OCProvisioningManager.hpp', 'resource', 'OCProvisioningManager.hpp')
 
-if target_os in ['linux']:
+if target_os in ['linux', 'tizen']:
     SConscript('examples/SConscript')