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

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

diff --git a/scripts_tpk/tcpackageslistsgen.py b/scripts_tpk/tcpackageslistsgen.py
index 0377360c04a876de5ae91e3930f12e5a09cee2ac..92f853d6c24b2098ea42d8f6531bfe7bcaafe23b 100755 (executable)
--- a/scripts_tpk/tcpackageslistsgen.py
+++ b/scripts_tpk/tcpackageslistsgen.py
@@ -90,7 +90,7 @@ if ( path.exists(FILE) == False ):
        exit('No such file: '+FILE)
 
 MODULE_NAME_MOD=MODULE_NAME+'-native-'+TYPE
-WORKSPACE_SRC_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+PROFILE+dirSeparator+MODULE_NAME_MOD
+WORKSPACE_SRC_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+PROFILE+'_'+ARCH+dirSeparator+MODULE_NAME_MOD
 
 CATEGORY='IntegrationTestCases'
 if ( TYPE == 'utc' ):

diff --git a/scripts_tpk/tctestsgen.py b/scripts_tpk/tctestsgen.py
index 6985cdf700325d78d511b29a061fbd6be38d09c7..7cf5968d198dc2d6246f16b9c76a2ad090353b75 100755 (executable)
--- a/scripts_tpk/tctestsgen.py
+++ b/scripts_tpk/tctestsgen.py
@@ -99,7 +99,7 @@ MODULE_NAME_MOD=MODULE_NAME+'-native-'+BUILD_TYPE
 MODULE_FULL_NAME='org.tizen.'+MODULE_NAME_MOD
 MODULE_NAME_C=capwords(MODULE_NAME, '-').replace('-', '')
 SCRIPT_DIR=path.abspath(path.dirname(argv[0]))
-WORKSPACE_SRC_DIR=getenv('HOME')+dirSeparator+'workspace'+'_'+profile+dirSeparator+MODULE_NAME_MOD
+WORKSPACE_SRC_DIR=getenv('HOME')+dirSeparator+'workspace'+'_'+profile+'_'+arch+dirSeparator+MODULE_NAME_MOD
 PACKAGING_DIR =SCRIPT_DIR+dirSeparator+".."+dirSeparator+"packaging"+dirSeparator+BUILD_TYPE+dirSeparator
 
 FILE=argv[3]+dirSeparator+'tests.xml'

diff --git a/scripts_tpk/tpk-install.py b/scripts_tpk/tpk-install.py
index 382dc0691ad9a30f6d1cb7b8e6010b60a08097f1..9a561ca620ca1668fe3f8f9d0d6440ce1fa64122 100755 (executable)
--- a/scripts_tpk/tpk-install.py
+++ b/scripts_tpk/tpk-install.py
@@ -238,7 +238,7 @@ if ( OS == 'Windows' ):
 
 PROJECT_DIR=(os.path.abspath(os.path.dirname(sys.argv[0])))
 TPK_DIR=os.getenv('HOME')+dirSeparator+'tpks'
-WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[2]
+WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[2]+'_'+sys.argv[1]
 
 # TODO use argparse
 if ( len(sys.argv) >= 2 ):

diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index b9551098ddf8165a1cf0cc1935ec4621cc459977..47a6959d223233c305af63d32db7209ecab58ea7 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="6.0"
 
 #####Check for architecture in case of TV  profile##########

diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index 40d80e436105e8534a19a6f6a573479f5b84dbbf..e9f34870956810fe0659c7c2003ec2dd7067899b 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`
@@ -404,12 +409,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
@@ -513,3 +518,4 @@ else
        echo "Entered invalid arguments"
        helpusage
 fi
+

diff --git a/scripts_tpk/tpksdk-install.py b/scripts_tpk/tpksdk-install.py
index 07b15ca2243a4e5b755723d69b5dcbcf8ed07eee..588c3221c5604b22e346c4bcd8fd31dcbc60b10e 100755 (executable)
--- a/scripts_tpk/tpksdk-install.py
+++ b/scripts_tpk/tpksdk-install.py
@@ -223,7 +223,7 @@ if ( OS == 'Windows' ):
 
 PROJECT_DIR=(os.path.abspath(os.path.dirname(sys.argv[0])))
 TPK_DIR=os.getenv('HOME')+dirSeparator+'tpks'
-WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[2]
+WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[2]+'_'+sys.argv[1]
 
 # TODO use argparse
 if ( len(sys.argv) >= 2 ):