X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Feasy-setup%2FSConscript;h=6096858fa14c522ebd62aa21e8a01cfe4c2e22a9;hb=17b7414f6f5fbab35a1f0cc143f0ec3ab4808eb1;hp=b5452bf0c588121e184c5a60fe0fb679685e68fe;hpb=2c8c26423d0abeff0f0c3b30bed8da399e95e74d;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/easy-setup/SConscript b/service/easy-setup/SConscript
old mode 100644
new mode 100755
index b5452bf..6096858
--- a/service/easy-setup/SConscript
+++ b/service/easy-setup/SConscript
@@ -1,6 +1,6 @@
 #******************************************************************
 #
-# Copyright 2014 Samsung Electronics All Rights Reserved.
+# Copyright 2016 Samsung Electronics All Rights Reserved.
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #
@@ -18,113 +18,25 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-##
-# easy-setup project build script
-##
-
-import os
-
-Import('env')
-
-transport = env.get('TARGET_TRANSPORT')
-
-env.AppendUnique(CPPDEFINES = ['EASY_SETUP_CA_INIT'])
-
-easy_setup_env = env.Clone()
-#
-target_os = env.get('TARGET_OS')
-
-lib_env = env.Clone()
-if target_os == 'android':
-	SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', exports = 'lib_env')
-
-######################################################################
-# Build flags
 ######################################################################
-easy_setup_env.AppendUnique(CPPPATH = ['sdk/inc', 'sdk/src', 'sdk/common'])
-
-if target_os not in ['windows', 'winrt']:
-    easy_setup_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
-    if target_os not in ['android', 'arduino']:
-        easy_setup_env.AppendUnique(CXXFLAGS = ['-pthread'])
-
-if target_os in ['android', 'linux']:
-	easy_setup_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-	easy_setup_env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
-	easy_setup_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-	if target_os not in ['linux', 'arduino']:
-		easy_setup_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'gnustl_shared'])	
-		if not env.get('RELEASE'):
-			easy_setup_env.AppendUnique(LIBS = ['log'])
-	else:
-		easy_setup_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'pthread', 'connectivity_abstraction'])
-if target_os == 'arduino':
-	if 'BLE' in transport:
-		easy_setup_env.AppendUnique(CPPPATH = [
-				       '../../resource/oc_logger/include',
-   				       '../../resource/csdk/logger/include',
-				       '../../resource/csdk/stack/include',
-				       '../../extlibs/cjson',
-					   'sdk/enrollee/arduino/ble',
-					   'sdk/enrollee/common/src',
-				       'sdk/enrollee/common/inc'])
-		easy_setup_env.AppendUnique(CPPDEFINES = ['TB_LOG', 'ESBLE'])			   
-	else:
-		easy_setup_env.AppendUnique(CPPPATH = [
-				       '../../resource/oc_logger/include',
-   				       '../../resource/csdk/logger/include',
-				       '../../resource/csdk/stack/include',
-				       '../../extlibs/cjson',
-					   'sdk/enrollee/arduino/wifi',
-					   'sdk/enrollee/common/src',
-				       'sdk/enrollee/common/inc'])
-		easy_setup_env.AppendUnique(CPPDEFINES = ['TB_LOG', 'ESWIFI'])
-if target_os in ['android','linux']:					   
-	easy_setup_env.PrependUnique(CPPPATH = [
-		env.get('SRC_DIR') + '/resource/c_common/oic_malloc/include',		
-		env.get('SRC_DIR') + '/resource/csdk/connectivity/common/inc',
-		env.get('SRC_DIR') + '/resource/csdk/connectivity/api',
-        env.get('SRC_DIR') + '/resource/csdk/stack/include',
-        env.get('SRC_DIR') + '/resource/csdk/logger/include',
-		env.get('SRC_DIR') + '/resource/csdk/security/include',
-		env.get('SRC_DIR') + '/extlibs/cjson',
-		'sdk/common',
-		'sdk/mediator/inc'])
-
-######################################################################
-# Source files and Targets
+# easy-setup project build script
 ######################################################################
+Import('env')
 
-if target_os == 'arduino':
-	if 'BLE' in transport:
-		es_sdk_static = easy_setup_env.StaticLibrary('ESSDKLibrary',
-						['sdk/enrollee/common/src/easysetupble.cpp',
-						'sdk/enrollee/common/src/resourceHandler.cpp'])
-	else:
-		es_sdk_static = easy_setup_env.StaticLibrary('ESSDKLibrary',
-						['sdk/enrollee/common/src/easysetup.cpp',
-						'sdk/enrollee/common/src/resourceHandler.cpp',
-						'sdk/enrollee/arduino/wifi/networkHandler.cpp'])
-	easy_setup_env.InstallTarget(es_sdk_static, 'libESSDK')
-
-if target_os == 'android':
-	if 'BLE' in transport:
-		es_sdk_shared = easy_setup_env.StaticLibrary('libESSDK',
-						['sdk/mediator/src/prov_adapter.cpp',
-						'sdk/mediator/src/ble_provisioning.cpp'])
-	else :
-		es_sdk_shared = easy_setup_env.StaticLibrary('libESSDK',
-						['sdk/mediator/src/prov_adapter.cpp',
-						'sdk/mediator/src/wifi_provisioning.cpp'])
-	easy_setup_env.InstallTarget(es_sdk_shared, 'libESSDK')
+es_target = env.get ('TARGET_OS')
+service_easy_setup_env = env.Clone()
 
-if target_os == 'linux':
-	es_sdk_shared = easy_setup_env.SharedLibrary('ESSDKLibrary',
-					['sdk/mediator/src/prov_adapter.cpp',
-					'sdk/mediator/src/wifi_provisioning.cpp'])
-	easy_setup_env.InstallTarget(es_sdk_shared, 'libESSDK')
+if es_target in ['android', 'ios', 'linux', 'tizen']:
+    SConscript('mediator/SConscript')
 
-#Go to build sample apps
-SConscript('sampleapp/SConscript')
+if es_target in ['linux', 'tizen']:
+    SConscript('enrollee/SConscript')
 
+if es_target in ['android', 'ios', 'linux', 'tizen']:
+    service_easy_setup_env.UserInstallTargetHeader('inc/escommon.h', 'service/easy-setup', 'escommon.h')
 
+if es_target in ['linux']:
+    SConscript('sampleapp/enrollee/linux-samsung/SConscript')
+    SConscript('sampleapp/mediator/linux-samsung/richsdk_sample/SConscript')
+    SConscript('sampleapp/enrollee/linux/SConscript')
+    SConscript('sampleapp/mediator/linux/richsdk_sample/SConscript')