X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=service%2Feasy-setup%2Fenrollee%2FSConscript;h=b2401f2c960316e63fa2b8b7bdc8f384ff62cadf;hb=refs%2Ftags%2Faccepted%2Ftizen%2Funified%2F20171010.063815;hp=47b895edd7e1d8780f02642be596bf3133664948;hpb=0e7762704ad69d816015184a55177d17c701188b;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript
index 47b895e..b2401f2 100644
--- a/service/easy-setup/enrollee/SConscript
+++ b/service/easy-setup/enrollee/SConscript
@@ -35,14 +35,6 @@ else:
 if enrollee_env.get('LOGGING'):
     enrollee_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-# Enrollees are implemented for IP transport only.
-if 'IP' in enrollee_env.get('TARGET_TRANSPORT'):
-	print "Enrollees are implemented for IP transport only"
-	enrollee_env.AppendUnique(CPPDEFINES = ['ESWIFI'])
-
-if enrollee_env.get('ES_SOFTAP_MODE') == 'ENROLLEE_SOFTAP':
-	enrollee_env.AppendUnique(CPPDEFINES = ['ENROLLEE_SOFTAP'])
-
 ######################################################################
 # Build flags
 ######################################################################
@@ -51,32 +43,38 @@ enrollee_env.PrependUnique(CPPPATH = [
 		enrollee_env.get('SRC_DIR') + '/resource/include',
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/logger/include',
 		enrollee_env.get('SRC_DIR') + '/resource/oc_logger/include',
-     	enrollee_env.get('SRC_DIR') + '/resource/csdk/stack/include',
-        enrollee_env.get('SRC_DIR') + '/resource/csdk/logger/include',
+                enrollee_env.get('SRC_DIR') + '/resource/csdk/stack/include',
+                enrollee_env.get('SRC_DIR') + '/resource/csdk/logger/include',
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/include',
+		enrollee_env.get('SRC_DIR') + '/resource/csdk/connectivity/api',
 		enrollee_env.get('SRC_DIR') + '/extlibs/cjson',
-		enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3',
 		enrollee_env.get('SRC_DIR') + '/service/easy-setup/inc',
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi',
 		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/inc',
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src'])
+		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src',
+		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/inc/samsung',
+		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/samsung'])
+if target_os not in ['tizen']:
+    enrollee_env.PrependUnique(CPPPATH = [
+        enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3'])
 
 if enrollee_env.get('SECURED') == '1':
 	enrollee_env.AppendUnique(CPPPATH = [
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include',
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/internal',
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/oxm'])
+	enrollee_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
-if target_os not in ['windows', 'winrt']:
+if target_os not in ['windows']:
 	enrollee_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x'])
 
+if not env.get('RELEASE'):
+    enrollee_env.PrependUnique(LIBS = ['gcov'])
+    enrollee_env.AppendUnique(CCFLAGS = ['--coverage'])
+
 ######################################################################
 # Linux Enrollee
 ######################################################################
-if target_os == 'linux':
-	enrollee_env.PrependUnique(CPPPATH = [
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi'])
-
+if target_os in ['linux']:
 	enrollee_env.AppendUnique(LIBS = ['pthread', 'dl'])
 	enrollee_env.AppendUnique(LIBPATH = [enrollee_env.get('BUILD_DIR')])
 	enrollee_env.AppendUnique(RPATH = [enrollee_env.get('BUILD_DIR')])
@@ -89,12 +87,10 @@ if target_os == 'linux':
 # Tizen Enrollee
 ######################################################################
 if target_os == 'tizen':
-	enrollee_env.AppendUnique(LIBPATH = [enrollee_env.get('BUILD_DIR')])
-	enrollee_env.AppendUnique(RPATH = [enrollee_env.get('BUILD_DIR')])
-	enrollee_env.AppendUnique(CXXFLAGS = ['-pthread'])
-	enrollee_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'pthread', 'connectivity_abstraction'])
-	enrollee_env.AppendUnique(CPPPATH = [
-			       enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/tizen/wifi'])
+   enrollee_env.AppendUnique(LIBPATH = [enrollee_env.get('BUILD_DIR')])
+   enrollee_env.AppendUnique(RPATH = [enrollee_env.get('BUILD_DIR')])
+   enrollee_env.AppendUnique(CXXFLAGS = ['-pthread'])
+   enrollee_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'pthread', 'connectivity_abstraction'])
 
 ######################################################################
 # Arduino Enrollee
@@ -103,51 +99,35 @@ if target_os == 'arduino':
 	enrollee_env.AppendUnique(LIBPATH = [enrollee_env.get('BUILD_DIR')])
 	enrollee_env.AppendUnique(RPATH = [enrollee_env.get('BUILD_DIR')])
 	enrollee_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'pthread', 'connectivity_abstraction'])
-	enrollee_env.AppendUnique(CPPPATH = [
-	               enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/wifi'])
 
 ######################################################################
 # Source files and Targets
 ######################################################################
 es_enrollee_src = None
 
-if target_os == 'linux':
-	es_enrollee_common_src =	[enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/easysetup.cpp',
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.cpp',
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.cpp',
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.cpp',
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi/softapnative.cpp',
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi/networkhandler.cpp']
-
-	enrollee_env.AppendUnique(es_enrollee_src = es_enrollee_common_src)
-
-	enrollee_sdk_shared = enrollee_env.SharedLibrary('ESEnrolleeSDK', enrollee_env.get('es_enrollee_src'))
-	enrollee_env.InstallTarget(enrollee_sdk_shared, 'libESEnrollee')
-
-if target_os == 'tizen':
-	enrollee_sdk_shared = enrollee_env.SharedLibrary('ESEnrolleeSDK',
-		[enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/easysetup.cpp',
-         enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.cpp',
-		 enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.cpp',
-		 enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.cpp',
-		 enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/tizen/wifi/networkhandler.cpp',
-		 enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/tizen/wifi/softapnative.cpp'])
-	enrollee_env.InstallTarget(enrollee_sdk_shared, 'libESEnrolleeSDK')
+if target_os in ['linux', 'tizen']:
+	es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c', './src/samsung/sc_easysetup.c']
+	enrollee_sdk_shared = enrollee_env.SharedLibrary('ESEnrolleeSDK', es_enrollee_common_src)
+	enrollee_sdk_static = enrollee_env.StaticLibrary('ESEnrolleeSDK', es_enrollee_common_src)
+	enrollee_env.InstallTarget([enrollee_sdk_shared, enrollee_sdk_static], 'libESEnrollee')
+	enrollee_env.UserInstallTargetLib([enrollee_sdk_shared, enrollee_sdk_static], 'libESEnrollee')
+	enrollee_env.UserInstallTargetHeader('inc/ESEnrolleeCommon.h', 'service/easy-setup', 'ESEnrolleeCommon.h')
+	enrollee_env.UserInstallTargetHeader('inc/easysetup.h', 'service/easy-setup', 'easysetup.h')
 
 if target_os == 'arduino':
-	es_sdk_static = enrollee_env.StaticLibrary('ESEnrolleeSDK', [
-					enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/easysetup.cpp',
-					enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.cpp',
-					enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.cpp',
-					enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.cpp',
-					enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp'])
-	enrollee_env.InstallTarget(es_sdk_static, 'libESEnrolleeSDK')
+	es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c']
+	enrollee_sdk_static = enrollee_env.StaticLibrary('ESEnrolleeSDK', es_enrollee_common_src)
+	enrollee_env.InstallTarget(enrollee_sdk_static, 'libESEnrolleeSDK')
+	enrollee_env.UserInstallTargetLib(enrollee_sdk_static, 'libESEnrollee')
 
 #Go to build sample apps
-if target_os == 'arduino':
-	SConscript('../sampleapp/enrollee/arduino/SConscript')
-
-if target_os == 'linux':
-	SConscript('../sampleapp/enrollee/linux/SConscript')
-
+#if target_os == 'arduino':
+#	SConscript('../sampleapp/enrollee/arduino/SConscript')
+
+#if target_os in ['linux']:
+#	SConscript('../sampleapp/enrollee/linux/SConscript')
+#	SConscript('../sampleapp/enrollee/linux-samsung/SConscript')
+#	#Build UnitTestcases for Enrollee
+#	if enrollee_env.get('SECURED') == '0':
+#		SConscript('../enrollee/unittests/SConscript')