Resolved build issue.

[platform/upstream/iotivity.git] / gbsbuild.sh

diff --git a/gbsbuild.sh b/gbsbuild.sh
index bc62fad..d9ab246 100755 (executable)
--- a/gbsbuild.sh
+++ b/gbsbuild.sh
@@ -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