Updated Tizen GBS build script to fix tinycbor clone error
authorAbhishek Pandey <abhi.siso@samsung.com>
Tue, 29 Sep 2015 06:44:41 +0000 (12:14 +0530)
committerMadan Lanka <lanka.madan@samsung.com>
Tue, 29 Sep 2015 09:51:19 +0000 (09:51 +0000)
During Jenkins build, tinycbor library is copied as a soft link in extlibs folder.
For Tizen build, we copy from this location to tmp folder, which in turn
is copied to GBS-ROOT during build. While copying from extlibs/tinycbor
which is present as a soft link, error appear during jenkins build.

Fixed the error by giving -L option during in copy command.
Also, added error return clause in gbs build script to enable
jenkins catch the error in case of build break.

Change-Id: I24c149dabd3ac3c382adf8aa11a60b0adae38a68
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
gbsbuild.sh

index bc62fad..d9ab246 100755 (executable)
@@ -15,12 +15,20 @@ sourcedir=`pwd`
 
 echo `pwd`
 
+# Clean tmp directory.
+rm -rf ./tmp
+
+# Create directory structure for GBS Build
 mkdir ./tmp
 mkdir ./tmp/extlibs/
 mkdir ./tmp/packaging
 cp -R ./build_common $sourcedir/tmp
 cp -R ./examples $sourcedir/tmp
-cp -R ./extlibs/tinycbor $sourcedir/tmp/extlibs
+
+# tinycbor is available as soft-link, so copying with 'dereference' option.
+cp -LR ./extlibs/tinycbor $sourcedir/tmp/extlibs
+rm -rf $sourcedir/tmp/extlibs/tinycbor/tinycbor/.git
+
 cp -R ./extlibs/cjson $sourcedir/tmp/extlibs
 cp -R ./extlibs/tinydtls $sourcedir/tmp/extlibs
 cp -R ./extlibs/sqlite3 $sourcedir/tmp/extlibs
@@ -32,6 +40,8 @@ cp ./extra_options.scons $sourcedir/tmp
 cp ./tools/tizen/*.spec ./tmp/packaging
 cp ./tools/tizen/*.manifest ./tmp/packaging
 cp ./SConstruct ./tmp
+
+# copy dependency RPMs and conf files for tizen build
 cp ./tools/tizen/*.rpm ./tmp
 cp ./tools/tizen/.gbs.conf ./tmp
 
@@ -58,7 +68,10 @@ if eval $gbscommand; then
    echo "Build is successful"
 else
    echo "Build failed!"
+   exit 1
 fi
 
 cd $sourcedir
 rm -rf $sourcedir/tmp
+
+exit 0