[TBT][Scripts][NonACR][Changes in build script]

Change-Id: Ib31dad1bfc4cd18e2e4a1da446e52e51fc56cb21
Signed-off-by: nibha.sharma <nibha.sharma@samsung.com>

diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index 2a1638920641e910faa0d81d0fe9b3f9c7126f9c..48efd77b6305c5c2e0df7c40799d928372ccac29 100755 (executable)
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -155,14 +155,7 @@ elif [ "$ARCH_TYPE" == "x86_64" ]; then
        ARCH="x86_64"
 fi
 
-UNSUPPORTED_FILE="tct_unsupported.txt"
-SUPPORTED=`cat ./$UNSUPPORTED_FILE | grep "$PROFILE_TYPE:$ARCH:$TESTCASE_TYPE:$MODULE_NAME;"`
-if [[ $SUPPORTED != "" ]]
-then
-       echo $green "Module:$MODULE_NAME is not supported"
-       echo $green"'SKIPPING' THIS MODULE FROM BUILD PROCESS"
-       echo ""$reset
-       sleep 1
+if [[ ( $MODULE_NAME == "BuildLog" ) || ( $MODULE_NAME == "docs" ) || ( $MODULE_NAME == "release" ) || ( $MODULE_NAME == "rootstrap.txt" ) || ( $MODULE_NAME == "scripts_tpk" ) || ( $MODULE_NAME == "tpkbuild" )]];   then
        exit
 fi
 

diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index b7b54be22957811d8b7f47628eb5b301ace5efab..aaa51c3c843ce1e85dbba402ac50192c74b8dd4f 100755 (executable)
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -88,15 +88,19 @@ function build {
 
        if [ "$#" -eq  "2" ]; then
                scripts_tpk/tpk_create.sh $1 $2 $ARCH_TYPE $PROFILE_TYPE | tee -a BuildLog/$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
+               if [[ ( $2 == "BuildLog" ) || ( $2 == "docs" ) || ( $2 == "release" ) || ( $2 == "rootstrap.txt" ) || ( $2 == "scripts_tpk" ) || ( $2 == "tpkbuild" )]];        then
                        rm BuildLog/$1/$2.txt
-                       break
+               #below code remove the log file in case build is SUCCESS
+               #keep the log file only for build FAILED modules
+               else
+                       while read LINE
+                       do
+                               if [[ $LINE =~ "CREATION  SUCCESSFUL" ]] || [[ $LINE =~ "BUILD FAILED : Module doesn't exist" ]]; then
+                                       rm BuildLog/$1/$2.txt
+                                       break
+                               fi
+                       done <BuildLog/$1/$2.txt
                fi
-       done <BuildLog/$1/$2.txt
        elif [ "$#" -eq  "1" ]; then
                for module in `ls -1 | grep -v CMakeList`
                do

diff --git a/tct_unsupported.txt b/tct_unsupported.txt
deleted file mode 100755 (executable)
index 007ee02..0000000
--- a/tct_unsupported.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-##########################################################################################################
-#### Add unsupported module in the form of <device_type>:<architecture>:<build-type>:<module-name>; ######
-##########################################################################################################
-
-##################
-##### mobile #####
-##################
-
-## tbt ##
-mobile:armv7l:tbt:BuildLog;
-mobile:armv7l:tbt:docs;
-mobile:armv7l:tbt:release;
-mobile:armv7l:tbt:scripts_tpk;
-mobile:armv7l:tbt:tct_unsupported.txt;
-mobile:armv7l:tbt:tpkbuild;
-mobile:x86:tbt:BuildLog;
-mobile:x86:tbt:docs;
-mobile:x86:tbt:release;
-mobile:x86:tbt:scripts_tpk;
-mobile:x86:tbt:tct_unsupported.txt;
-mobile:x86:tbt:tpkbuild;
-