X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2FSConscript;h=897e390f9661571432ae35cbce0aeb919481a1f0;hb=390866079e285d2c74918432c0d597d5da52f8a0;hp=367590a64da969b6319bb9ca954c508cec159693;hpb=3e9402ad71cb3e93266a77796f44d17bab9853fd;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
old mode 100755
new mode 100644
index 367590a..897e390
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -11,6 +11,7 @@ ca_transport = env.get('TARGET_TRANSPORT')
 secured = env.get('SECURED')
 with_ra = env.get ('WITH_RA')
 with_tcp = env.get('WITH_TCP')
+src_dir = env.get('SRC_DIR')
 root_dir = os.pardir
 ca_path = os.curdir
 
@@ -23,7 +24,9 @@ print"Reading ca script %s"%ca_transport
 env.PrependUnique(CPPPATH = [ os.path.join(root_dir, 'api') ])
 env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'inc'),
                              os.path.join(root_dir, 'lib/libcoap-4.1.1'),
-                             os.path.join(root_dir, 'common/inc') ])
+                             os.path.join(src_dir, '/resource/csdk/logger/include/'),
+                             os.path.join(root_dir, 'common/inc'),
+                             os.path.join(root_dir, 'util/inc') ])
 
 if ca_os not in ['arduino', 'windows', 'winrt']:
 	env.AppendUnique(CPPDEFINES = ['WITH_POSIX'])
@@ -37,6 +40,9 @@ if ca_os in ['darwin','ios']:
 # Getting common source files
 env.SConscript('./../common/SConscript')
 
+# Getting util source files
+env.SConscript(root_dir + '/util/SConscript')
+
 # The tinydtls library is found in '#extlibs/tinydtls', where the '#'
 # is interpreted by SCons as the top-level iotivity directory where
 # the SConscruct file is found.
@@ -45,18 +51,22 @@ if env.get('SECURED') == '1':
 		env.SConscript(os.path.join(root_dir, 'extlibs/tinydtls/SConscript'))
 	else:
 		env.SConscript('#extlibs/tinydtls/SConscript')
+	if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/timer'):
+		env.SConscript(os.path.join(root_dir, 'extlibs/timer/SConscript'))
+		env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/timer')])
+	else:
+		env.SConscript('#extlibs/timer/SConscript')
+		env.AppendUnique(CPPPATH = ['#extlibs/timer'])
 
 env.AppendUnique(CA_SRC = [os.path.join(ca_path,
                                         'adapter_util/caadapterutils.c')])
-env.AppendUnique(CA_SRC = [os.path.join(ca_path,
-                                        'adapter_util/cafragmentation.c')])
+
 if env.get('SECURED') == '1':
 	env.AppendUnique(CA_SRC = [os.path.join(ca_path,
                                                 'adapter_util/caadapternetdtls.c')])
 	env.AppendUnique(CPPPATH = [os.path.join(root_dir,
                                                  'external/inc')])
 if env.get('DTLS_WITH_X509') == '1':
-	src_dir = env.get('SRC_DIR')
 	env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/connectivity/inc/pkix'])
 	env.AppendUnique(CPPPATH = [src_dir + '/extlibs/tinydtls/ecc/'])
 	env.AppendUnique(CPPPATH = [src_dir + '/extlibs/tinydtls/sha2/'])
@@ -95,7 +105,7 @@ else:
 		'caqueueingthread.c',
 		'caretransmission.c',
 		]
-	if (('BT' in ca_transport) or ('IP' in ca_transport) or ('ALL' in ca_transport)):
+	if (('IP' in ca_transport) or ('ALL' in ca_transport)):
 		env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'cablockwisetransfer.c') ])
 		env.AppendUnique(CPPDEFINES = ['WITH_BWT'])
 	if secured == '1':
@@ -114,6 +124,8 @@ if 'ALL' in ca_transport:
 		transports = [ 'ip_adapter', 'bt_edr_adapter', 'bt_le_adapter']
 		if with_ra:
 				transports.append ('ra_adapter')
+		if ca_os in ['android']:
+				transports.append ('nfc_adapter')
 		env.SConscript(dirs = [
 				os.path.join(ca_path, d) for d in transports ])
 
@@ -126,9 +138,17 @@ if 'BT' in ca_transport:
 if 'BLE' in ca_transport:
 	env.SConscript(os.path.join(ca_path, 'bt_le_adapter/SConscript'))
 
-if ca_os in ['linux', 'tizen']:
+if 'NFC' in ca_transport:
+	env.SConscript(os.path.join(ca_path, 'nfc_adapter/SConscript'))
+
+if ca_os in ['linux', 'tizen', 'android']:
 	if with_tcp == True:
 		env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript'))
+		env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
+
+if ca_os in ['linux', 'tizen', 'android', 'arduino', 'ios']:
+	if (('BLE' in ca_transport) or ('BT' in ca_transport) or ('ALL' in ca_transport)):
+		env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
 
 print "Include path is %s" % env.get('CPPPATH')
 print "Files path is %s" % env.get('CA_SRC')
@@ -136,6 +156,7 @@ if ca_os in ['android', 'tizen']:
 	env.AppendUnique(LIBS = ['coap'])
 	if env.get('SECURED') == '1':
 		env.AppendUnique(LIBS = ['tinydtls'])
+		env.AppendUnique(LIBS = ['timer'])
 	if ca_os != 'android':
 		env.AppendUnique(LIBS = ['rt'])
 	calib = env.SharedLibrary('connectivity_abstraction', env.get('CA_SRC'))
@@ -143,4 +164,3 @@ else:
 	calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
 env.InstallTarget(calib, 'libconnectivity_abstraction')
 env.UserInstallTargetLib(calib, 'libconnectivity_abstraction')
-