From: YounghyunJoo <yh_.joo@samsung.com>
Date: Thu, 24 Nov 2016 06:59:00 +0000 (+0900)
Subject: Modify gbsbuild script file to support other options
X-Git-Tag: 1.3.0~1050^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff44e0460f619689790f8c4d08d5333a6f204f50;p=platform%2Fupstream%2Fiotivity.git

Modify gbsbuild script file to support other options

- before this commit, gbsbuild script file can get a few build options like as "WITH_TCP, WITH_CLOUD, WITH_PROXY, etc.."
- so, to add other option, need to modify gbsbuild scriptfile.
- in this commit, I modified gbsbuild script file to support other options
- using bash script, gets other option like way to get option in other platform
- ex) ./gbsbuild.sh WITH_TCP=1 WITH_CLOUD=1 SECURED=1 WITH_MQ=PUB,SUB

Change-Id: I61c0b02fe68acf517b64de7e3a8a10fe2549c3d2
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14637
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JunHo Lee <junho13.lee@samsung.com>
Reviewed-by: daeken kwon <daeken.kwon@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
---

diff --git a/gbsbuild.sh b/gbsbuild.sh
index c90d7b3..4ce13ef 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`
@@ -55,40 +55,28 @@ cp -R $sourcedir/iotivity.pc.in $sourcedir/tmp
 
 cd $sourcedir/tmp
 
-withtcp=0
-withcloud=0
-withproxy=0
-withmq=OFF
-rdmode=CLIENT
 secured=0
+gbscommand="gbs build -A armv7l "
+
 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
-
-   if [ "RD_MODE" = $ARGUMENT_VALUE ];then
-       rdmode=CLIENT,SERVER
-   fi
-
-   if [ "SECURED" = $ARGUMENT_VALUE ];then
-       secured=1
+   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
@@ -108,7 +96,6 @@ if [ ! -d .git ]; then
 fi
 
 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' --define 'RD_MODE $rdmode' --define 'SECURED $secured' -B ~/GBS-ROOT-OIC --include-all --repository ./"
 echo $gbscommand
 if eval $gbscommand; then
     echo "Build is successful"