From: Amritanshu Pandia <a.pandia1@samsung.com>
Date: Mon, 5 Dec 2016 11:09:18 +0000 (+0530)
Subject: [TCT][scripts][Non-ACR][Resolved dali module build error]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=345ba00c4799097eb911618f8fe54daa3463f5da;p=test%2Ftct%2Fnative%2Fapi.git

[TCT][scripts][Non-ACR][Resolved dali module build error]

Change-Id: I9e02fa8cb25c2076b1cddec8b7a76c7d775f095b
Signed-off-by: Amritanshu Pandia <a.pandia1@samsung.com>
---

diff --git a/scripts/tcbuild.sh b/scripts/tcbuild.sh
old mode 100644
new mode 100755
index b86d6705e..2e5ad12d6
--- a/scripts/tcbuild.sh
+++ b/scripts/tcbuild.sh
@@ -624,7 +624,7 @@ function inst {
 				if [ $INSTALL_MODE == 0 ]; then
 					if [[ $MOD_NAME == "dali-application" ]]; then
 						cp templates/external_wrapper_dali_app_launch/external_wrapper.sh /tmp/$TCT_DIR/
-					elif [[ $MOD_NAME == *"dali"* ]]; then
+					elif [[ ( $MOD_NAME =~ "dali-" ) || ( $MOD_NAME =~ "_dali" ) ]]; then
 						cp templates/external_wrapper_dali_binary_launch/external_wrapper.sh /tmp/$TCT_DIR/
 					else
 						cp templates/external_wrapper_execution/external_wrapper.sh /tmp/$TCT_DIR/
diff --git a/scripts/tcbuildsdk.sh b/scripts/tcbuildsdk.sh
index 3c74772db..cdba757e4 100755
--- a/scripts/tcbuildsdk.sh
+++ b/scripts/tcbuildsdk.sh
@@ -625,7 +625,7 @@ function inst {
 				if [ $INSTALL_MODE == 0 ]; then
 					if [[ $MOD_NAME == "dali-application" ]]; then
 						cp templates/external_wrapper_dali_app_launch/external_wrapper.sh /tmp/$TCT_DIR/
-					elif [[ $MOD_NAME == *"dali"* ]]; then
+					elif [[ ( $MOD_NAME =~ "dali-" ) || ( $MOD_NAME =~ "_dali" ) ]]; then
 						cp templates/external_wrapper_dali_binary_launch/external_wrapper.sh /tmp/$TCT_DIR/
 					else
 						cp templates/external_wrapper_execution/external_wrapper.sh /tmp/$TCT_DIR/
diff --git a/scripts_tpk/tpk-install.py b/scripts_tpk/tpk-install.py
index e27740468..a4942eb92 100755
--- a/scripts_tpk/tpk-install.py
+++ b/scripts_tpk/tpk-install.py
@@ -145,10 +145,11 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH):
 			
 			# external_wrapper.sh
 			process_dali_application = "dali-application"
-			process = "dali"
+			process1 = "dali-"
+			process2 = "_dali"
 			if ( re.search(process_dali_application, MODNAME) != None ):
 				shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_app_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh')
-			elif ( re.search(process, MODNAME) != None ):
+			elif ( re.search(process1, MODNAME) != None or re.search(process2, MODNAME) != None ):
 				shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_binary_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh')
 			else:
 				shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR)
diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index a38cd0a06..0d37dd8d1 100755
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -39,13 +39,13 @@ fi
 copy_native_core()
 {
 	if [ "$3" == "utc" ]; then
-		if [[ $2 =~ "dali-" ]];	then
+		if [[ ( $2 =~ "dali-" ) || ( $2 =~ "_dali" ) ]];	then
 			cp $2/*core.cpp $1/src/.
 		else
 			cp $2/*core.c $1/src/.
 		fi
 	else
-		if [[ $2 =~ "dali-" ]];	then
+		if [[ ( $2 =~ "dali-" ) || ( $2 =~ "_dali" ) ]];	then
 			cp $2/*native.cpp $1/src/.
 		else
 			cp $2/*native.c $1/src/.
@@ -63,7 +63,7 @@ deploySourceFile() {
 	#copying common source and header files 
 	cp $2/../../common/*.c $1/src/.
 	cp $2/../../common/*.h $1/inc/.
-	if [[ $2 =~ "dali-" ]];	then
+	if [[ ( $2 =~ "dali-" ) || ( $2 =~ "_dali" ) ]];	then
 		cp $2/../../common/*.cpp $1/src/.
 	fi
 	
@@ -186,7 +186,7 @@ deploySourceFile() {
 	sed -i -f scripts_tpk/$3.sed $1/inc/tct_common.h
 	
 	# include tct_common.h in utc source files
-	if [[ $2 =~ "dali-" ]];	then
+	if [[ ( $2 =~ "dali-" ) || ( $2 =~ "_dali" ) ]];	then
 		for srcFile in `ls $1/src/`
 		do
 			sed -i '1i\#include <tct_common.h>' $1/src/$srcFile
@@ -201,7 +201,7 @@ deploySourceFile() {
 	
 	cd $1
 	
-	if [[ $2 =~ "dali-" ]];	then
+	if [[ ( $2 =~ "dali-" ) || ( $2 =~ "_dali" ) ]];	then
 		find ./src -iname *.cpp -print0 | tr '\0' ' ' > test.files
 		find ./src -iname *.c -print0 | tr '\0' ' ' >> test.files
 	else
diff --git a/scripts_tpk/tpksdk-install.py b/scripts_tpk/tpksdk-install.py
index 0ef63ba92..299dbd68f 100755
--- a/scripts_tpk/tpksdk-install.py
+++ b/scripts_tpk/tpksdk-install.py
@@ -140,10 +140,11 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH):
 			
 			# external_wrapper.sh
 			process_dali_application = "dali-application"
-			process = "dali"
+			process1 = "dali-"
+			process2 = "_dali"
 			if ( re.search(process_dali_application, MODNAME) != None ):
 				shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_app_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh')
-			elif ( re.search(process, MODNAME) != None ):
+			elif ( re.search(process1, MODNAME) != None or re.search(process2, MODNAME) != None ):
 				shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_binary_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh')
 			else:
 				shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR)