X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gbsbuild.sh;h=9532294d3c21c98474e9d2a50cb93674af33e448;hb=refs%2Ftags%2Fsubmit%2Ftizen%2F20180105.072814;hp=58c2cdf66a4c7531965d31beb6b43762d72ea5e6;hpb=ab896889008b2939f6e3e21521815bbc27c49e3b;p=platform%2Fupstream%2Fiotivity.git

diff --git a/gbsbuild.sh b/gbsbuild.sh
index 58c2cdf..9532294 100755
--- a/gbsbuild.sh
+++ b/gbsbuild.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -e
 
 spec=`ls tools/tizen/*.spec`
 version=`rpm --query --queryformat '%{version}\n' --specfile $spec`
@@ -32,7 +32,6 @@ rm -rf $sourcedir/tmp/extlibs/tinycbor/tinycbor/.git
 cp -R ./extlibs/cjson $sourcedir/tmp/extlibs
 cp -R ./extlibs/mbedtls $sourcedir/tmp/extlibs
 cp -R ./extlibs/gtest $sourcedir/tmp/extlibs
-cp -R ./extlibs/tinydtls $sourcedir/tmp/extlibs
 cp -LR ./extlibs/sqlite3 $sourcedir/tmp/extlibs
 cp -R ./extlibs/timer $sourcedir/tmp/extlibs
 cp -R ./extlibs/rapidxml $sourcedir/tmp/extlibs
@@ -55,7 +54,36 @@ cp -R $sourcedir/iotivity.pc.in $sourcedir/tmp
 
 cd $sourcedir/tmp
 
-rm -rf ./extlibs/tinycbor/tinycbor/.git*
+secured=1
+gbscommand="gbs build -A armv7l "
+
+for ARGUMENT_VALUE in $*
+do
+   echo $ARGUMENT_VALUE
+   if [[ "$ARGUMENT_VALUE" = *"="* ]]; then
+      optionname=$(echo $ARGUMENT_VALUE | cut -f1 -d=)
+      optionvalue=$(echo $ARGUMENT_VALUE | cut -f2 -d=)
+      echo -- "# $optionname $optionvalue"
+      gbscommand=${gbscommand}" --define '$optionname $optionvalue'"
+
+      if [ "SECURED" = "$optionname" ]; then
+         secured=$optionvalue
+      fi
+   else
+      echo "'$ARGUMENT_VALUE' does not contain '='";
+   fi
+done
+
+gbscommand="${gbscommand} -B ~/GBS-ROOT-OIC --include-all --repository ./"
+
+if [ $secured -eq 1 ];then
+  echo `pwd`
+  # Prepare mbedTLS dependency
+  $SHELL ./extlibs/mbedtls/prep.sh
+fi
+
+# Prepare TinyCBOR dependency
+$SHELL ./extlibs/tinycbor/prep.sh
 
 # Initialize Git repositoryㅣ
 if [ ! -d .git ]; then
@@ -66,32 +94,7 @@ if [ ! -d .git ]; then
    git commit -m "Initial commit"
 fi
 
-withtcp=0
-withcloud=0
-withproxy=0
-withmq=OFF
-for ARGUMENT_VALUE in $*
-do
-   echo $ARGUMENT_VALUE
-   if [ "WITH_TCP" = $ARGUMENT_VALUE ];then
-       withtcp=1
-   fi
-
-   if [ "WITH_CLOUD" = $ARGUMENT_VALUE ];then
-       withcloud=1
-   fi
-
-   if [ "WITH_PROXY" = $ARGUMENT_VALUE ];then
-       withproxy=1
-   fi
-
-   if [ "WITH_MQ" = $ARGUMENT_VALUE ];then
-       withmq=PUB,SUB,BROKER
-   fi
-done
-
 echo "Calling core gbs build command"
-gbscommand="gbs build -A armv7l --define 'WITH_TCP $withtcp' --define 'WITH_CLOUD $withcloud' --define 'WITH_PROXY $withproxy' --define 'WITH_MQ $withmq' -B ~/GBS-ROOT-OIC --include-all --repository ./"
 echo $gbscommand
 if eval $gbscommand; then
     echo "Build is successful"