X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Fsamples%2Ftizen%2Fbuild%2FSConscript;h=225d6178a863cca97b94da62e37543abb5d3adb6;hb=5148ecb7f2c052bfb429d4060fbdf0f6bae7a4f9;hp=1e3722a99f4784c46684b8800b0d670fd7a738f5;hpb=659142c01b7a3a0dcfd1c84c00c50b48913539c5;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/stack/samples/tizen/build/SConscript b/resource/csdk/stack/samples/tizen/build/SConscript
index 1e3722a..225d617 100644
--- a/resource/csdk/stack/samples/tizen/build/SConscript
+++ b/resource/csdk/stack/samples/tizen/build/SConscript
@@ -13,13 +13,24 @@ release_mode = env.get('RELEASE')
 secured = env.get('SECURED')
 logging = env.get('LOGGING')
 routing = env.get('ROUTING')
+with_proxy = env.get('WITH_PROXY')
+with_tcp = env.get('WITH_TCP')
+with_mq = env.get('WITH_MQ')
+disable_ble_server = env.get('DISABLE_BLE_SERVER')
+
+with_upstream_libcoap = 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.
+	env.AppendUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])
+else:
+	# For bring up purposes only, the forked version will live here.
+	env.AppendUnique(CPPPATH = ['../../../../connectivity/lib/libcoap-4.1.1'])
 
 env.PrependUnique(CPPPATH = [
 		'../../../../logger/include',
 		'../../../../stack/include',
 		'../../../../../../extlibs/cjson',
-		'../../../../../oc_logger/include',
-		'../../../../../connectivity/lib/libcoap-4.1.1'
+		'../../../../../oc_logger/include'
 		])
 
 env.AppendUnique(CPPDEFINES = ['TB_LOG'])
@@ -29,11 +40,20 @@ elif routing == 'EP':
 	env.AppendUnique(CPPDEFINES = ['ROUTING_EP'])
 env.AppendUnique(CPPDEFINES = ['__TIZEN__'])
 
+if env.get('WITH_PROXY'):
+	env.AppendUnique(CPPDEFINES = ['WITH_CHPROXY'])
+
 print "Given Transport is %s" % transport
 print "Given OS is %s" % target_os
+print "Given MQ is %s" % with_mq
+
+gbs_command_prefix = ""
+if (('BLE' in transport) or ('ALL' in transport)):
+	print "Tizen BLE requires tizen 3.0 profile"
+	gbs_command_prefix += "gbsprofile=tizen_4_0_unified_armv7l "
 
 if target_os == 'tizen':
-	command = "sh resource/csdk/stack/samples/tizen/build/gbsbuild.sh %s %s %s %s %s %s" % (transport, secured, buildsample, release_mode, logging, routing)
+	command = gbs_command_prefix + "./resource/csdk/stack/samples/tizen/build/gbsbuild.sh %s %s %s %s %s %s %s %s %s %s" % (transport, secured, buildsample, release_mode, logging, routing, with_tcp, with_proxy, with_mq, disable_ble_server)
 	print "Created Command is %s" % command
 	gbs_script = env.Command('gbs_build', None, command)
-	AlwaysBuild ('gbs_script')
\ No newline at end of file
+	AlwaysBuild ('gbs_script')