Resolved Tizen RI sample build error for SECURED=1 and enabled build in Jenkins

Change-Id: Ide348722046cb4dcf962f7652b6a5f19794d5b83
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/auto_build.sh b/auto_build.sh
index 82f1ef0..50fa09d 100755 (executable)
--- a/auto_build.sh
+++ b/auto_build.sh
@@ -150,6 +150,9 @@ function build_tizen()
        echo "*********** Build for Tizen octbstack lib and sample *************"
        scons -f resource/csdk/stack/samples/tizen/build/SConscript TARGET_OS=tizen TARGET_TRANSPORT=IP LOGGING=true RELEASE=$1 $2
 
+       echo "*********** Build for Tizen octbstack lib and sample with Security*************"
+       scons -f resource/csdk/stack/samples/tizen/build/SConscript TARGET_OS=tizen TARGET_TRANSPORT=IP LOGGING=true SECURED=1 RELEASE=$1 $2
+
        echo "*********** Build for Tizen octbstack lib and sample with Routing Manager*************"
        scons -f resource/csdk/stack/samples/tizen/build/SConscript TARGET_OS=tizen TARGET_TRANSPORT=IP LOGGING=true ROUTING=GW RELEASE=$1 $2
 }

diff --git a/resource/csdk/stack/samples/tizen/README.txt b/resource/csdk/stack/samples/tizen/README.txt
index 4786ab3..33cae04 100644 (file)
--- a/resource/csdk/stack/samples/tizen/README.txt
+++ b/resource/csdk/stack/samples/tizen/README.txt
@@ -1,3 +1,12 @@
+Prerequisites
+=============
+
+1) Clone tinycbor library using following command from the path "iotivity/extlibs/tinycbor":
+   git clone https://github.com/01org/tinycbor.git extlibs/tinycbor/tinycbor
+2) To build with SECURITY=1, download sqlite3 zip file and extract it. Copy the files 
+   sqlite3.c and sqlite3.h file to iotivity/extlibs/sqlite3/ folder.
+   Download using http://www.sqlite.org/2015/sqlite-amalgamation-3081101.zip
+
 Build Procedure
 ===============
 

diff --git a/resource/csdk/stack/samples/tizen/build/gbsbuild.sh b/resource/csdk/stack/samples/tizen/build/gbsbuild.sh
index 6931d8f..987199f 100644 (file)
--- a/resource/csdk/stack/samples/tizen/build/gbsbuild.sh
+++ b/resource/csdk/stack/samples/tizen/build/gbsbuild.sh
@@ -46,6 +46,7 @@ cp -R ./extlibs/cjson $sourcedir/tmp/extlibs
 cp -R ./extlibs/tinydtls $sourcedir/tmp/extlibs
 cp -R ./extlibs/timer $sourcedir/tmp/extlibs
 cp -R ./extlibs/rapidxml $sourcedir/tmp/extlibs
+cp -LR ./extlibs/sqlite3 $sourcedir/tmp/extlibs
 cp -R ./resource/csdk/stack/samples/tizen/build/packaging/*.spec $sourcedir/tmp/packaging
 cp -R ./resource $sourcedir/tmp/
 cp -R ./build_common/external_libs.scons $sourcedir/tmp/

diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
index 5919540..0f570ef 100644 (file)
--- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
+++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
@@ -48,7 +48,7 @@ cp -f %{ROOTDIR}/resource/csdk/connectivity/src/libconnectivity_abstraction.so %
 cp -f %{ROOTDIR}/resource/csdk/connectivity/lib/libcoap-4.1.1/libcoap.a %{buildroot}/%{_libdir}
 cp /usr/lib/libuuid.so.1 %{buildroot}%{_libdir}
 if echo %{SECURED}|grep -qi '1'; then
-       cp -f %{ROOTDIR}/con/extlibs/tinydtls/libtinydtls.a %{buildroot}/%{_libdir}
+       cp -f %{ROOTDIR}/extlibs/tinydtls/libtinydtls.a %{buildroot}/%{_libdir}
 fi
 
 cp -rf %{ROOTDIR}/resource/csdk/stack/include/ocstack.h* %{DEST_INC_DIR}/