From 1e0f74128b1dd3594c7a879b69a357c8a5d90d88 Mon Sep 17 00:00:00 2001
From: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Date: Wed, 26 Oct 2016 10:38:41 +0530
Subject: [PATCH] [Scripts_tpk][All][Non-ACR][Resolved issues to install all
 modules]

Change-Id: I8512d826dfc6140d1599ac1500f86e76ecbd5a28
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
---
 scripts_tpk/tpk-install.py    | 14 +++++++-------
 scripts_tpk/tpkbuild.sh       | 20 ++++++++++----------
 scripts_tpk/tpksdk-install.py | 14 +++++++-------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/scripts_tpk/tpk-install.py b/scripts_tpk/tpk-install.py
index fd118b6..6abd11a 100755
--- a/scripts_tpk/tpk-install.py
+++ b/scripts_tpk/tpk-install.py
@@ -59,9 +59,9 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT):
 	rpmCheck=False
 	global INSTALL_PKG_COUNT
 	if ( TYPE == None ):
-		install('ctc', None, PROFILE)
-		install('itc', None, PROFILE)
-		install('utc', None, PROFILE)
+		install('ctc', None, PROFILE, TC_COUNT)
+		install('itc', None, PROFILE, TC_COUNT)
+		install('utc', None, PROFILE, TC_COUNT)
 	else:
 		if ( MODNAME == None ):
 			#os.chdir(WORKSPACE_DIR)
@@ -69,7 +69,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT):
 				for f in files:
 					r=re.search('^org\.tizen\.(?P<module_name>.*)-native-'+TYPE+'-1\.0\.0-arm\.tpk', f)
 					if ( r ):
-						install(TYPE, r.group('module_name'), PROFILE)
+						install(TYPE, r.group('module_name'), PROFILE, TC_COUNT)
 
 		else:
 			print('')
@@ -228,11 +228,11 @@ WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[1]
 if ( len(sys.argv) >= 2 ):
 	profile=sys.argv[1]
 if ( len(sys.argv) >= 3 ):
-	build_ctype=sys.argv[2]
+	tc_count=sys.argv[2]
 if ( len(sys.argv) >= 4 ):
-	module=sys.argv[3]
+	build_ctype=sys.argv[3]
 if ( len(sys.argv) >= 5 ):
-	tc_count=sys.argv[4]
+	module=sys.argv[4]
 
 if ( os.path.exists('install.log') ):
 	os.remove('install.log')
diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index c9cc96a..27e256f 100755
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -127,10 +127,10 @@ function install {
 
 	if [ "$ARCH_TYPE" == "arm" ]; then
 		ln -sf ./scripts_tpk/tpk-install.py $PWD/tpk-install
-		python tpk-install $PROFILE_TYPE $TC_TYPE $MOD_NAME $TC_COUNT
+		python tpk-install $PROFILE_TYPE $TC_COUNT $TC_TYPE $MOD_NAME
 	elif [ "$ARCH_TYPE" == "x86" ]; then
 		ln -sf ./scripts_tpk/tpksdk-install.py $PWD/tpksdk-install
-		python tpksdk-install $PROFILE_TYPE $TC_TYPE $MOD_NAME $TC_COUNT
+		python tpksdk-install $PROFILE_TYPE $TC_COUNT $TC_TYPE $MOD_NAME
 	fi
 
 	if [ $INSTALL_CHILD == 1 ]; then 
@@ -147,16 +147,16 @@ function install {
 
 function install_custom {
 
-	TC_TYPE=$1
-	MOD_NAME=$2
-	TC_COUNT=$3
+	TC_TYPE=$2
+	MOD_NAME=$3
+	TC_COUNT=$1
 		
 	if [ "$ARCH_TYPE" == "arm" ]; then
 		ln -sf ./scripts_tpk/tpk-install.py $PWD/tpk-install
-		python tpk-install $PROFILE_TYPE $TC_TYPE $MOD_NAME $TC_COUNT
+		python tpk-install $PROFILE_TYPE $TC_COUNT $TC_TYPE $MOD_NAME
 	elif [ "$ARCH_TYPE" == "x86" ]; then
 		ln -sf ./scripts_tpk/tpksdk-install.py $PWD/tpksdk-install
-		python tpksdk-install $PROFILE_TYPE $TC_TYPE $MOD_NAME $TC_COUNT
+		python tpksdk-install $PROFILE_TYPE $TC_COUNT $TC_TYPE $MOD_NAME
 	fi
 
 	if [ $INSTALL_CHILD == 1 ]; then 
@@ -255,20 +255,20 @@ elif [ "install_custom" == "$1" ]; then
 	if [ "$#" -eq  "4" ]; then
 		TC_COUNT=$4
 		MODULE_NAME=""
-		install_custom $MODULE_NAME $TC_COUNT
+		install_custom $TC_COUNT $MODULE_NAME
 	
 	elif  [ "$#" -eq  "5" ]; then
 		check_tc_type $2 $3 $4 $5
 		MODULE_NAME=""
 		TC_COUNT=$5
-		install_custom $TESTCASE_TYPE $MODULE_NAME $TC_COUNT
+		install_custom $TC_COUNT $TESTCASE_TYPE $MODULE_NAME
 	
 	elif  [ "$#" -eq  "6" ]; then
 		check_tc_type $2 $3 $4 $5 $6
 		TESTCASE_TYPE=$2
 		MODULE_NAME=$3
 		TC_COUNT=$6
-		install_custom $TESTCASE_TYPE $MODULE_NAME $TC_COUNT
+		install_custom $TC_COUNT $TESTCASE_TYPE $MODULE_NAME
 	else
 		echo "Entered wrong number of arguments"
 		helpusage
diff --git a/scripts_tpk/tpksdk-install.py b/scripts_tpk/tpksdk-install.py
index 423f3f5..0fbab9d 100755
--- a/scripts_tpk/tpksdk-install.py
+++ b/scripts_tpk/tpksdk-install.py
@@ -59,9 +59,9 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT):
 	rpmCheck=False
 	global INSTALL_PKG_COUNT
 	if ( TYPE == None ):
-		install('ctc', None, PROFILE)
-		install('itc', None, PROFILE)
-		install('utc', None, PROFILE)
+		install('ctc', None, PROFILE, TC_COUNT)
+		install('itc', None, PROFILE, TC_COUNT)
+		install('utc', None, PROFILE, TC_COUNT)
 	else:
 		if ( MODNAME == None ):
 			#os.chdir(WORKSPACE_DIR)
@@ -69,7 +69,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT):
 				for f in files:
 					r=re.search('^org\.tizen\.(?P<module_name>.*)-native-'+TYPE+'-1\.0\.0-'+ARCH+'\.tpk', f)
 					if ( r ):
-						install(TYPE, r.group('module_name'), PROFILE)
+						install(TYPE, r.group('module_name'), PROFILE, TC_COUNT)
 
 		else:
 			print('')
@@ -225,11 +225,11 @@ ARCH='i386'
 if ( len(sys.argv) >= 2 ):
 	profile=sys.argv[1]
 if ( len(sys.argv) >= 3 ):
-	build_ctype=sys.argv[2]
+	tc_count=sys.argv[2]
 if ( len(sys.argv) >= 4 ):
-	module=sys.argv[3]
+	build_ctype=sys.argv[3]
 if ( len(sys.argv) >= 5 ):
-	tc_count=sys.argv[4]
+	module=sys.argv[4]
 
 if ( os.path.exists('install.log') ):
 	os.remove('install.log')
-- 
2.7.4