Fixed Tizen DTLS related scripts.
Change-Id: I0ace0f5e44d8b6808f7a71d994464f5202d1aa89
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1126
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
cp -R $cur_dir/samples/tizen/ $sourcedir/tmp/con/sample/
mkdir -p $sourcedir/tmp/con/sample/lib/tizen/ble/libs
cp -R $cur_dir/lib/tizen/ble/libs/* $sourcedir/tmp/con/sample/lib/tizen/ble/libs/
+mkdir -p $sourcedir/tmp/con/sample/external/inc
+cp -R $cur_dir/external/inc/* $sourcedir/tmp/con/sample/external/inc/
+mkdir -p $sourcedir/tmp/con/extlibs/
+cp -R ./extlibs/tinydtls/ $sourcedir/tmp/con/extlibs/
cd $sourcedir
cd $cur_dir/build/tizen
git commit -m "Initial commit"
fi
echo "Calling sample gbs build command"
- gbscommand="gbs build -A armv7l --include-all --define 'TARGET_TRANSPORT $1' --define 'SECURED $2' --define 'LOGGING $5' --repository ./"
+ gbscommand="gbs build -A armv7l --include-all --define 'TARGET_TRANSPORT $1' --define 'SECURED $2' --define 'RELEASE $4' --define 'LOGGING $5' --repository ./"
echo $gbscommand
if eval $gbscommand; then
echo "Sample build is successful"
cp -f %{ROOTDIR}/con/src/libconnectivity_abstraction.so %{buildroot}/%{_libdir}
cp -f %{ROOTDIR}/con/lib/libcoap-4.1.1/libcoap.a %{buildroot}/%{_libdir}
+if echo %{SECURED}|grep -qi '1'; then
+ cp -f %{ROOTDIR}/con/extlibs/tinydtls/libtinydtls.a %{buildroot}/%{_libdir}
+fi
cp -rf %{ROOTDIR}/con/api/cacommon.h* %{DEST_INC_DIR}/
cp -rf %{ROOTDIR}/con/inc/caadapterinterface.h* %{DEST_INC_DIR}/
cp -rf %{ROOTDIR}/con/common/inc/cathreadpool.h* %{DEST_INC_DIR}/
%build
scons TARGET_OS=tizen -c
-scons TARGET_OS=tizen TARGET_TRANSPORT=%{TARGET_TRANSPORT}
+scons TARGET_OS=tizen TARGET_TRANSPORT=%{TARGET_TRANSPORT} SECURED=%{SECURED} RELEASE=%{RELEASE}
%install
target_os = env.get('TARGET_OS')
transport = env.get('TARGET_TRANSPORT')
+secured = env.get('SECURED')
OIC_LIB = 'oic'
root_dir = env.get('ROOT_DIR')
'-lm', '-lpthread', '-lrt', '-ldl', '-lstdc++', '-lgobject-2.0', '-lgio-2.0', '-lglib-2.0', '-lcapi-network-wifi', '-ldlog', '-lcapi-network-bluetooth', '-lconnectivity_abstraction', 'coap',
])
+if secured == '1':
+ env.PrependUnique(CPPPATH = [root_dir + '/external/inc/'])
+ env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
+ env.Append(LIBS=['-ltinydtls'])
+
env.Prepend(RPATH=[root_dir +'/lib/tizen/ble/libs/',])
if 'ALL' in transport:
env.AppendUnique(CPPDEFINES = ['IP_ADAPTER','EDR_ADAPTER','LE_ADAPTER','BT_ADAPTER_TEST','BLE_ADAPTER_TEST'])
secured = env.get('SECURED')
root_dir = './../'
ca_path = './'
-current_dir=env.get('SRC_DIR')
+if ca_os == 'tizen':
+ current_dir = root_dir
+else:
+ current_dir=env.get('SRC_DIR')
# The tinydtls library location is ~/iotivity/extlibs. When scons run from connectivity folder,
# the build folder is ~/iotivity/resource/csdk/connectivity/out/linux/x86_64/release/.