tizen4 flag was defined in the code, but it was not used.
So tizen BLE CA layer is using internal APIs. This patchset
modifies build options and disable internal API usage.
Change-Id: I283085e4525207c4df2cd40b683e6f67b3aa6662
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
help_vars.Add(EnumVariable('BLE_CUSTOM_ADV', 'Build with CUSTOM Advertisement', 'False', allowed_values=('True', 'False')))
help_vars.Add(EnumVariable('BLE_DIVISION', 'BLE Build with division code', 'OFF', allowed_values=('OFF', 'MCD', 'VD')))
help_vars.Add(EnumVariable('BLE_TIZEN_30', 'Build with tizen 3.0 BLE api', 'False', allowed_values=('True', 'False')))
help_vars.Add(EnumVariable('BLE_CUSTOM_ADV', 'Build with CUSTOM Advertisement', 'False', allowed_values=('True', 'False')))
help_vars.Add(EnumVariable('BLE_DIVISION', 'BLE Build with division code', 'OFF', allowed_values=('OFF', 'MCD', 'VD')))
help_vars.Add(EnumVariable('BLE_TIZEN_30', 'Build with tizen 3.0 BLE api', 'False', allowed_values=('True', 'False')))
-help_vars.Add(EnumVariable('TIZEN_4', 'Build with tizen 4.0 api', 'False', allowed_values=('True', 'False')))
+help_vars.Add(EnumVariable('BLE_TIZEN_40', 'Build with tizen 4.0 BLE api', 'False', allowed_values=('True', 'False')))
help_vars.Add(PathVariable('TIZENRT_OS_DIR', 'Absolute Path to TizenRT OS directory', None, PathVariable.PathAccept))
help_vars.Add(EnumVariable('PLATFORM_TLS', 'Use platform tls instead of local mbedtls', '0', allowed_values=('0', '1')))
help_vars.Add(EnumVariable('OIC_SUPPORT_TIZEN_TRACE', 'Tizen Trace(T-trace) api availability', 'False', allowed_values=('True', 'False')))
help_vars.Add(PathVariable('TIZENRT_OS_DIR', 'Absolute Path to TizenRT OS directory', None, PathVariable.PathAccept))
help_vars.Add(EnumVariable('PLATFORM_TLS', 'Use platform tls instead of local mbedtls', '0', allowed_values=('0', '1')))
help_vars.Add(EnumVariable('OIC_SUPPORT_TIZEN_TRACE', 'Tizen Trace(T-trace) api availability', 'False', allowed_values=('True', 'False')))
%{!?RD_MODE: %define RD_MODE CLIENT}
%{!?BLE_CUSTOM_ADV: %define BLE_CUSTOM_ADV False}
%{!?BLE_DIVISION: %define BLE_DIVISION VD}
%{!?RD_MODE: %define RD_MODE CLIENT}
%{!?BLE_CUSTOM_ADV: %define BLE_CUSTOM_ADV False}
%{!?BLE_DIVISION: %define BLE_DIVISION VD}
-%{!?BLE_TIZEN_30: %define BLE_TIZEN_30 True}
%{!?DISABLE_BLE_SERVER: %define DISABLE_BLE_SERVER 0}
%{!?MULTIPLE_OWNER: %define MULTIPLE_OWNER 1}
%{!?DISABLE_BLE_SERVER: %define DISABLE_BLE_SERVER 0}
%{!?MULTIPLE_OWNER: %define MULTIPLE_OWNER 1}
+%{!?BLE_TIZEN_40: %define BLE_TIZEN_40 True}
BuildRequires: expat-devel
BuildRequires: python, libcurl-devel
BuildRequires: expat-devel
BuildRequires: python, libcurl-devel
RD_MODE=%{RD_MODE} \
BLE_CUSTOM_ADV=%{BLE_CUSTOM_ADV} \
BLE_DIVISION=%{BLE_DIVISION} \
RD_MODE=%{RD_MODE} \
BLE_CUSTOM_ADV=%{BLE_CUSTOM_ADV} \
BLE_DIVISION=%{BLE_DIVISION} \
- BLE_TIZEN_30=%{BLE_TIZEN_30} \
+ BLE_TIZEN_40=%{BLE_TIZEN_40} \
DISABLE_BLE_SERVER=%{DISABLE_BLE_SERVER} \
MULTIPLE_OWNER=%{MULTIPLE_OWNER} \
LOG_LEVEL=%{log_level} \
DISABLE_BLE_SERVER=%{DISABLE_BLE_SERVER} \
MULTIPLE_OWNER=%{MULTIPLE_OWNER} \
LOG_LEVEL=%{log_level} \
root_dir = os.pardir
division = env.get('BLE_DIVISION')
tizen30 = env.get('BLE_TIZEN_30')
root_dir = os.pardir
division = env.get('BLE_DIVISION')
tizen30 = env.get('BLE_TIZEN_30')
+tizen40 = env.get('BLE_TIZEN_40')
env.PrependUnique(CPPPATH = [ os.path.join(src_dir, 'tizen')])
env.PrependUnique(CPPPATH = [ os.path.join(src_dir, 'tizen')])
env.AppendUnique(CPPDEFINES = ['BLE_MCD'])
print "BLE for MCD"
env.AppendUnique(CPPDEFINES = ['BLE_MCD'])
print "BLE for MCD"
+if tizen40 == 'True':
+ env.AppendUnique(CPPDEFINES = ['BLE_TIZEN_30'])
+ env.AppendUnique(CPPDEFINES = ['BLE_TIZEN_40'])
+ print "Build using Tizen 4.0 BLE API"
+elif tizen30 == 'True':
env.AppendUnique(CPPDEFINES = ['BLE_TIZEN_30'])
print "Build using Tizen 3.0 BLE API"
env.AppendUnique(CPPDEFINES = ['BLE_TIZEN_30'])
print "Build using Tizen 3.0 BLE API"
#include "oic_malloc.h"
#include "caleutil.h"
#include "cautilinterface.h"
#include "oic_malloc.h"
#include "caleutil.h"
#include "cautilinterface.h"
#include <bluetooth_internal.h>
#endif
#include <bluetooth_internal.h>
#endif
unsigned int mtu = CA_DEFAULT_BLE_MTU_SIZE;
int ret = 0;
unsigned int mtu = CA_DEFAULT_BLE_MTU_SIZE;
int ret = 0;
bt_gatt_client_h client = NULL;
ret = bt_gatt_client_create(address, &client);
if (0 != ret)
bt_gatt_client_h client = NULL;
ret = bt_gatt_client_create(address, &client);
if (0 != ret)
"bt_device_get_att_mtu failed with return [%s]", CALEGetErrorMsg(ret));
return CA_DEFAULT_BLE_MTU_SIZE;
}
"bt_device_get_att_mtu failed with return [%s]", CALEGetErrorMsg(ret));
return CA_DEFAULT_BLE_MTU_SIZE;
}
OIC_LOG_V(INFO, TAG, "mtu size(including header) from bt_device_get_att_mtu is %d", mtu);
OIC_LOG(DEBUG, TAG, "OUT");
OIC_LOG_V(INFO, TAG, "mtu size(including header) from bt_device_get_att_mtu is %d", mtu);
OIC_LOG(DEBUG, TAG, "OUT");
#include "caleutil.h"
#include "caadapterutils.h"
#include <glib.h>
#include "caleutil.h"
#include "caadapterutils.h"
#include <glib.h>
#include <bluetooth_internal.h>
#endif
#include <bluetooth_internal.h>
#endif
unsigned int mtu = CA_DEFAULT_BLE_MTU_SIZE;
int ret = 0;
unsigned int mtu = CA_DEFAULT_BLE_MTU_SIZE;
int ret = 0;
bt_gatt_client_h client = NULL;
ret = bt_gatt_client_create(address, &client);
if (0 != ret)
bt_gatt_client_h client = NULL;
ret = bt_gatt_client_create(address, &client);
if (0 != ret)
"bt_device_get_att_mtu failed with return [%s]", CALEGetErrorMsg(ret));
return CA_DEFAULT_BLE_MTU_SIZE;
}
"bt_device_get_att_mtu failed with return [%s]", CALEGetErrorMsg(ret));
return CA_DEFAULT_BLE_MTU_SIZE;
}
OIC_LOG_V(INFO, TAG, "mtu size(including header) from bt_device_get_att_mtu is %d", mtu);
OIC_LOG(DEBUG, TAG, "OUT");
OIC_LOG_V(INFO, TAG, "mtu size(including header) from bt_device_get_att_mtu is %d", mtu);
OIC_LOG(DEBUG, TAG, "OUT");
Name: iotivity
Version: 1.2.1
Release: 0
Name: iotivity
Version: 1.2.1
Release: 0
-Summary: IoT Connectivity sponsored by the OCF
+Summary: Samsung IoT Connectivity
Group: Network & Connectivity / IoT Connectivity
License: Apache-2.0
URL: https://www.iotivity.org/
Group: Network & Connectivity / IoT Connectivity
License: Apache-2.0
URL: https://www.iotivity.org/
%define ex_lib_dir %{buildroot}%{_libdir}
%define ex_include_dir %{buildroot}%{_includedir}
%define ex_lib_dir %{buildroot}%{_libdir}
%define ex_include_dir %{buildroot}%{_includedir}
+%if 0%{?tizen_version_major} < 3
%if ! 0%{?license:0}
%define license %doc
%endif
%if ! 0%{?license:0}
%define license %doc
%endif
%if ! 0%{?manifest:0}
%define manifest %doc
%endif
%if ! 0%{?manifest:0}
%define manifest %doc
%endif
# Default values to be eventually overiden BEFORE or as gbs params:
%{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen}
# Default values to be eventually overiden BEFORE or as gbs params:
%{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen}
%{!?WITH_MQ: %define WITH_MQ OFF}
%{!?WITH_PROXY: %define WITH_PROXY 0}
%{!?WITH_TCP: %define WITH_TCP 1}
%{!?WITH_MQ: %define WITH_MQ OFF}
%{!?WITH_PROXY: %define WITH_PROXY 0}
%{!?WITH_TCP: %define WITH_TCP 1}
+%{!?DISABLE_TCP_SERVER: %define DISABLE_TCP_SERVER 1}
%{!?RD_MODE: %define RD_MODE CLIENT}
%{!?BLE_CUSTOM_ADV: %define BLE_CUSTOM_ADV False}
%{!?BLE_DIVISION: %define BLE_DIVISION VD}
%{!?RD_MODE: %define RD_MODE CLIENT}
%{!?BLE_CUSTOM_ADV: %define BLE_CUSTOM_ADV False}
%{!?BLE_DIVISION: %define BLE_DIVISION VD}
-%{!?BLE_TIZEN_30: %define BLE_TIZEN_30 True}
%{!?DISABLE_BLE_SERVER: %define DISABLE_BLE_SERVER 0}
%{!?DISABLE_BLE_SERVER: %define DISABLE_BLE_SERVER 0}
-%{!?MULTIPLE_OWNER: %define MULTIPLE_OWNER 0}
+%{!?MULTIPLE_OWNER: %define MULTIPLE_OWNER 1}
+%{!?BLE_TIZEN_40: %define BLE_TIZEN_40 True}
BuildRequires: expat-devel
BuildRequires: python, libcurl-devel
BuildRequires: expat-devel
BuildRequires: python, libcurl-devel
WITH_MQ=%{WITH_MQ} \
WITH_PROXY=%{WITH_PROXY} \
WITH_TCP=%{WITH_TCP} \
WITH_MQ=%{WITH_MQ} \
WITH_PROXY=%{WITH_PROXY} \
WITH_TCP=%{WITH_TCP} \
+ DISABLE_TCP_SERVER=%{DISABLE_TCP_SERVER} \
RD_MODE=%{RD_MODE} \
BLE_CUSTOM_ADV=%{BLE_CUSTOM_ADV} \
BLE_DIVISION=%{BLE_DIVISION} \
RD_MODE=%{RD_MODE} \
BLE_CUSTOM_ADV=%{BLE_CUSTOM_ADV} \
BLE_DIVISION=%{BLE_DIVISION} \
- BLE_TIZEN_30=%{BLE_TIZEN_30} \
+ BLE_TIZEN_40=%{BLE_TIZEN_40} \
DISABLE_BLE_SERVER=%{DISABLE_BLE_SERVER} \
MULTIPLE_OWNER=%{MULTIPLE_OWNER} \
DISABLE_BLE_SERVER=%{DISABLE_BLE_SERVER} \
MULTIPLE_OWNER=%{MULTIPLE_OWNER} \
- OIC_SUPPORT_TIZEN_TRACE=%{OIC_SUPPORT_TIZEN_TRACE} \
LOG_LEVEL=%{log_level} \
#eol
LOG_LEVEL=%{log_level} \
#eol
mkdir -p %{ex_install_dir}
mkdir -p %{ex_include_dir}
mkdir -p %{ex_lib_dir}/pkgconfig
mkdir -p %{ex_install_dir}
mkdir -p %{ex_include_dir}
mkdir -p %{ex_lib_dir}/pkgconfig
#cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/examples/OICMiddle/OICMiddle %{ex_install_dir}
#cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/examples/devicediscoveryclient %{ex_install_dir}
#cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/examples/devicediscoveryserver %{ex_install_dir}
#cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/examples/OICMiddle/OICMiddle %{ex_install_dir}
#cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/examples/devicediscoveryclient %{ex_install_dir}
#cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/examples/devicediscoveryserver %{ex_install_dir}
cp -R ./extlibs/mbedtls/mbedtls/include/mbedtls/ %{buildroot}%{_includedir}
cp ./resource/csdk/security/include/*.h %{buildroot}%{_includedir}
cp ./resource/csdk/connectivity/api/*.h %{buildroot}%{_includedir}/
cp -R ./extlibs/mbedtls/mbedtls/include/mbedtls/ %{buildroot}%{_includedir}
cp ./resource/csdk/security/include/*.h %{buildroot}%{_includedir}
cp ./resource/csdk/connectivity/api/*.h %{buildroot}%{_includedir}/
+cp ./resource/csdk/security/include/internal/*.h %{buildroot}%{_includedir}/
cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}
cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir}
cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}
cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir}
mkdir -p %{ex_include_dir}/service/resource-encapsulation
mkdir -p %{ex_include_dir}/service/notification
mkdir -p %{ex_include_dir}/service/easy-setup
mkdir -p %{ex_include_dir}/service/resource-encapsulation
mkdir -p %{ex_include_dir}/service/notification
mkdir -p %{ex_include_dir}/service/easy-setup
cp resource/oc_logger/include/*.h %{buildroot}%{_includedir}/resource
cp resource/oc_logger/include/*.hpp %{buildroot}%{_includedir}/resource
cp resource/oc_logger/include/*.h %{buildroot}%{_includedir}/resource
cp resource/oc_logger/include/*.hpp %{buildroot}%{_includedir}/resource
cp resource/c_common/*.h %{buildroot}%{_includedir}
cp resource/c_common/ocrandom/include/*.h %{buildroot}%{_includedir}
cp resource/c_common/oic_string/include/*.h %{buildroot}%{_includedir}
cp resource/c_common/*.h %{buildroot}%{_includedir}
cp resource/c_common/ocrandom/include/*.h %{buildroot}%{_includedir}
cp resource/c_common/oic_string/include/*.h %{buildroot}%{_includedir}