From: uzchoi <uzchoi@samsung.com>
Date: Mon, 11 Jul 2016 02:54:47 +0000 (+0900)
Subject: Merge branch 'master' into extended-easysetup
X-Git-Tag: 1.2.0+RC1~136^2^2~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f38dc188968757d7eec20816b7964b052fe5a32;hp=-c;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into extended-easysetup

Change-Id: Ifad200718955d1f1382178e72c36866b538af622
---

1f38dc188968757d7eec20816b7964b052fe5a32
diff --combined service/easy-setup/enrollee/SConscript
index 0c4ea68,8d255aa..53d2cfb
--- a/service/easy-setup/enrollee/SConscript
+++ b/service/easy-setup/enrollee/SConscript
@@@ -68,7 -68,7 +68,7 @@@ if enrollee_env.get('SECURED') == '1'
  		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/internal',
  		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/oxm'])
  
- if target_os not in ['windows', 'winrt']:
+ if target_os not in ['windows']:
  	enrollee_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x'])
  
  ######################################################################
@@@ -90,11 -90,12 +90,11 @@@ 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'])
 +   enrollee_env.AppendUnique(CPPPATH = [enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/tizen/wifi'])
  
  ######################################################################
  # Arduino Enrollee
@@@ -112,13 -113,12 +112,13 @@@ if target_os == 'arduino'
  es_enrollee_src = None
  
  if target_os == 'linux':
 -	es_enrollee_common_src =	[enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/easysetup.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi/softapnative.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi/networkhandler.c']
 +	es_enrollee_common_src = [enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/easysetup.c',
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.c',
 +		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.c'
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.c',
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi/softapnative.c',
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi/networkhandler.c'
 +		]
  
  	enrollee_env.AppendUnique(es_enrollee_src = es_enrollee_common_src)
  
@@@ -126,41 -126,31 +126,41 @@@
  	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.c',
 -         	enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/tizen/wifi/networkhandler.c',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/tizen/wifi/softapnative.c'])
 -	enrollee_env.InstallTarget(enrollee_sdk_shared, 'libESEnrolleeSDK')
 +	es_enrollee_common_src = [enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/easysetup.c',
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.c',
 +		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.c'
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.c',
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi/softapnative.c',
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/linux/wifi/networkhandler.c'
 +		]
 +
 +	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')
  	enrollee_env.UserInstallTargetLib(enrollee_sdk_shared, 'libESEnrolleeSDK')
  
  if target_os == 'arduino':
  	es_sdk_static = enrollee_env.StaticLibrary('ESEnrolleeSDK', [
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/easysetup.cpp',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/onboarding.cpp',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/softap.cpp',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/resourcehandler.cpp',
 -		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp'])
 +#		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/easysetup.cpp',
 +#		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/onboarding.cpp',
 +#		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/softap.cpp',
 +#		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/resourcehandler.cpp',
 +#		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp'])
 +		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/easysetup.c',
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.c',
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.c',
 +		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.c'
 +		#enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp'
 +		])
 +
  	enrollee_env.InstallTarget(es_sdk_static, 'libESEnrolleeSDK')
  
  #Go to build sample apps
 -if target_os == 'arduino':
 -	SConscript('../sampleapp/enrollee/arduino/SConscript')
 +#if target_os == 'arduino':
 +#	SConscript('../sampleapp/enrollee/arduino/SConscript')
  
  if target_os == 'linux':
  	SConscript('../sampleapp/enrollee/linux/SConscript')
  	#Build UnitTestcases for Enrollee
 -	SConscript('../enrollee/unittests/SConscript')
 +#	SConscript('../enrollee/unittests/SConscript')
  
diff --combined service/easy-setup/mediator/richsdk/SConscript
index 6c0c101,8ed21ad..f7cd0d9
--- a/service/easy-setup/mediator/richsdk/SConscript
+++ b/service/easy-setup/mediator/richsdk/SConscript
@@@ -59,7 -59,7 +59,7 @@@ target_os = env.get('TARGET_OS'
  ######################################################################
  easy_setup_env.AppendUnique(CPPPATH = ['inc', 'src', '../../inc'])
  
- if target_os not in ['windows', 'winrt']:
+ if target_os not in ['windows']:
      easy_setup_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x'])
  
  if target_os in ['linux']:
@@@ -86,7 -86,6 +86,7 @@@ if target_os in ['linux']
  		easy_setup_env.AppendUnique(LIBS = ['ocpmapi', 'ocprovision'])
  
  if target_os in ['android','linux']:
 +#if target_os in ['linux']:
  	easy_setup_env.PrependUnique(CPPPATH = [
  		env.get('SRC_DIR') + '/resource/c_common/oic_malloc/include',
  		env.get('SRC_DIR') + '/resource/include',
@@@ -115,13 -114,11 +115,13 @@@ print"easysetup_path %s" % easysetup_pa
  es_src = None
  
  if target_os in ['android','linux']:
 +#if target_os in ['linux']:
  	if env.get('SECURED') == '1':
  		env.AppendUnique(es_src = [os.path.join(easysetup_path, 'src/EnrolleeSecurity.cpp')])
  
  	es_common_src =	['src/RemoteEnrollee.cpp',
 -		'src/RemoteEnrolleeResource.cpp',
 +		'src/EnrolleeResource.cpp',
 +		'src/CloudResource.cpp',
  		'src/EasySetup.cpp',
  		'src/ESException.cpp']
  
@@@ -141,6 -138,6 +141,6 @@@ if target_os == 'linux'
  ######################################################################
  #Build UnitTestcases for Mediator[RichSDK]
  ################################################ ######################
 -if target_os == 'linux':
 -    SConscript('unittests/SConscript')
 +#if target_os == 'linux':
 +#    SConscript('unittests/SConscript')
  
diff --combined service/easy-setup/mediator/richsdk/android/jni/Android.mk
index 74d2ac3,fe63791..b14b2c4
--- a/service/easy-setup/mediator/richsdk/android/jni/Android.mk
+++ b/service/easy-setup/mediator/richsdk/android/jni/Android.mk
@@@ -20,7 -20,7 +20,7 @@@ LOCAL_MODULE    := easysetup-jn
  DEFINE_FLAG =  -DWITH_POSIX -D__ANDROID__
  
  #Add Debug flags here
 -DEBUG_FLAG      = -DTB_LOG
 +DEBUG_FLAG = -DTB_LOG
  
  BUILD_FLAG = $(DEFINE_FLAG) $(DEBUG_FLAG)
  
@@@ -34,19 -34,19 +34,19 @@@ LOCAL_C_INCLUDES := $(LOCAL_PATH) 
  					$(LOCAL_PATH)/../../src \
  					$(LOCAL_PATH)/../../../../inc \
  					$(LOCAL_PATH)/../../../../../../resource/csdk/logger/include \
 -				    $(LOCAL_PATH)/../../../../../../resource/csdk/connectivity/common/inc \
 +					$(LOCAL_PATH)/../../../../../../resource/csdk/connectivity/common/inc \
  					$(LOCAL_PATH)/../../../../../../resource/c_common/oic_string/include \
  					$(LOCAL_PATH)/../../../../../../resource/include \
  					$(LOCAL_PATH)/../../../../../../resource/c_common \
  					$(LOCAL_PATH)/../../../../../../resource/oc_logger/include \
- 					$(LOCAL_PATH)/../../../../../../resource/csdk/ocmalloc/include \
+ 					$(LOCAL_PATH)/../../../../../../resource/c_common/oic_malloc/include \
  					$(LOCAL_PATH)/../../../../../../resource/csdk/connectivity/api \
  					$(LOCAL_PATH)/../../../../../../resource/csdk/stack/include \
  					$(LOCAL_PATH)/../../../../../../resource/csdk/logger/include \
  					$(LOCAL_PATH)/../../../../../../resource/csdk/security/include \
  					$(LOCAL_PATH)/../../../../../../extlibs/cjson \
  					$(LOCAL_PATH)/../../../../../../extlibs/boost/boost_1_58_0 \
 -                    $(LOCAL_PATH)/../../../../../../extlibs/timer \
 +					$(LOCAL_PATH)/../../../../../../extlibs/timer \
  					$(LOCAL_PATH)/../../../../../../android/android_api/base/jni \
  
  LOCAL_SRC_FILES += $(patsubst $(LOCAL_PATH)/%, %, $(wildcard $(LOCAL_PATH)/*.cpp))