[NativeTCT][Non-ACR]Changes for path creation based on architecture

Change-Id: I22568a2a5defcb2fda6f2aff0488a5b5870b2807
Signed-off-by: Ankit Srivastava <ankit.sri1@samsung.com>

diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index a1e7a15482fbc8ea0de995d4669ac822624622b0..6eb87dce2097c025337d73131a3b54b605d429d9 100755 (executable)
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -594,7 +594,11 @@ TIZENIOTMODULENAME="$2"
 ARCH_TYPE="$3"
 APPLLICATION_PROFILE="basic-ui"
 PROFILE_TYPE="$4"
-WORKSPACE_PATH="$HOME/workspace_$PROFILE_TYPE"
+if [ "$ARCH_TYPE" == "x86" ]; then
+         WORKSPACE_PATH="$HOME/workspace_${PROFILE_TYPE}_i586"
+else
+         WORKSPACE_PATH="$HOME/workspace_${PROFILE_TYPE}_${ARCH_TYPE}"
+fi
 CURRENT_VERSION="7.0"
 
 #####Check for architecture in case of TV  profile##########

diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index a4b393586619e57f89f3a1ad6fc60b2cc01cfbd6..47914b27e4704333cfeec1e0722e6d99766a0027 100755 (executable)
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -18,6 +18,7 @@
 PWD=`pwd`
 PROFILE_TYPE=""
 ARCH_TYPE=""
+LOG_ARCH_TYPE=""
 TESTCASE_TYPE=""
 MODULE_NAME=""
 TC_COUNT=""
@@ -63,12 +64,16 @@ fi
 if   [ "$1" != "addmod" ] && [ "$1" != "rmmod" ]; then
        if   [ "$2" = "armv7l" ] || [ "$3" = "armv7l" ] || [ "$4" = "armv7l" ] || [ "$5" = "armv7l" ]; then
                ARCH_TYPE="arm"
+                LOG_ARCH_TYPE="armv7l"
        elif [ "$2" = "x86" ] || [ "$3" = "x86"  ] || [ "$4" = "x86"  ] || [ "$5" = "x86"  ]; then
                ARCH_TYPE="x86"
+                LOG_ARCH_TYPE="x86"
        elif [ "$2" = "aarch64" ] || [ "$3" = "aarch64"  ] || [ "$4" = "aarch64"  ] || [ "$5" = "aarch64"  ]; then
                ARCH_TYPE="aarch64"
+                LOG_ARCH_TYPE="aarch64"
        elif [ "$2" = "x86_64" ] || [ "$3" = "x86_64"  ] || [ "$4" = "x86_64"  ] || [ "$5" = "x86_64"  ]; then
                ARCH_TYPE="x86_64"
+                LOG_ARCH_TYPE="x86_64"
        else
                echo "Add argument '32 bit architecture (armv7l or x86)'"
                echo "Add argument '64 bit architecture (aarch64 or x86_64)'"
@@ -107,17 +112,17 @@ function check_tc_type {
 function build {
 
        if [ "$#" -eq  "2" ]; then
-               scripts_tpk/tpk_create.sh $1 $2 $ARCH_TYPE $PROFILE_TYPE | tee -a BuildLog/$1/$2.txt
+               scripts_tpk/tpk_create.sh $1 $2 $ARCH_TYPE $PROFILE_TYPE | tee -a BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}/$1/$2.txt
 
        #below code remove the log file in case build is SUCCESS
        #keep the log file only for build FAILED modules
        while read LINE
        do
                if [[ $LINE =~ "CREATION  SUCCESSFUL" ]] || [[ $LINE =~ "BUILD FAILED : Module doesn't exist" ]] || [[ $LINE =~ "'SKIPPING' THIS MODULE FROM BUILD PROCESS" ]]; then
-                       rm BuildLog/$1/$2.txt
+                       rm BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}/$1/$2.txt
                        break
                fi
-       done <BuildLog/$1/$2.txt
+       done <BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}/$1/$2.txt
 
        elif [ "$#" -eq  "1" ]; then
                for module in `ls -1 src/$1/ | grep -v CMakeList`
@@ -410,12 +415,12 @@ elif [ "rmmod" == "$1" ]; then
        rm_module $2 $3
 elif [ "build" == "$1" ]; then
 
-       if [ -d BuildLog ];then
-               rm -rf BuildLog
+       if [ -d BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE} ];then
+               rm -rf BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}
        fi
-       mkdir -p BuildLog/itc
-       mkdir -p BuildLog/ctc
-       mkdir -p BuildLog/utc
+       mkdir -p BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}/itc
+       mkdir -p BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}/ctc
+       mkdir -p BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}/utc
 
        if [ "$#" -eq  "3" ]; then
                build
@@ -519,3 +524,4 @@ else
        echo "Entered invalid arguments"
        helpusage
 fi
+