[NativeTCT][Scripts][NonACR][Sequence to call rootstrap version and template version...

Change-Id: If1abb3407362bf4892684cc9f0ba937d9bc5fcd4
Signed-off-by: Nibha Sharma <nibha.sharma@samsung.com>

diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index 8c3149bec98be222ea19e979a9b7f68071fc4c5d..3a588dd043c67472f5d2285c79655d6cc84563d9 100755 (executable)
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -680,17 +680,6 @@ elif [ $ARCH_TYPE == "x86_64" ]; then
        DEVICE_TYPE="emulator64"
 fi
 
-#Checking rootstrap
-if [ $PROFILE_TYPE == "mobile" ]; then
-       checkRootstrap "$ROOTSTRAP_MOBILE" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION
-elif [ $PROFILE_TYPE == "wearable" ]; then
-       checkRootstrap "$ROOTSTRAP_WEARABLE" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION
-elif [ $PROFILE_TYPE == "tizeniot" ]; then
-       checkRootstrap "$ROOTSTRAP_TIZENIOT" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION
-elif [ $PROFILE_TYPE == "tv" ]; then
-       checkRootstrap "$ROOTSTRAP_TV" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION
-fi
-
 if [ $PROFILE_TYPE == "tizeniot" ]; then
        SCRIPT_DIR=$PWD/scripts_tpk
 
@@ -710,6 +699,17 @@ echo "[APPLLICATION_PROFILE] : $APPLLICATION_PROFILE"
 RunCommand "tizen create native-project -p $BUILD_PROFILE-6.0 -t $APPLLICATION_PROFILE -n $PROJECT_NAME -- $WORKSPACE_PATH" "Project creation $PROJECT_NAME"
 deploySourceFile "$WORKSPACE_PATH/$PROJECT_NAME" "$SRC_DIRCTORY/$TESTCASE_TYPE/$MODULE_NAME" "$PROFILE_TYPE" "$PROJECT_NAME" "$TESTCASE_TYPE" "$MODULE_NAME"
 
+#Checking rootstrap
+if [ $PROFILE_TYPE == "mobile" ]; then
+       checkRootstrap "$ROOTSTRAP_MOBILE" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION
+elif [ $PROFILE_TYPE == "wearable" ]; then
+       checkRootstrap "$ROOTSTRAP_WEARABLE" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION
+elif [ $PROFILE_TYPE == "tizeniot" ]; then
+       checkRootstrap "$ROOTSTRAP_TIZENIOT" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION
+elif [ $PROFILE_TYPE == "tv" ]; then
+       checkRootstrap "$ROOTSTRAP_TV" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION
+fi
+
 if [ $BUILD_PROFILE == "wearable" ]; then
        if [ -z "$ROOTSTRAP_WEARABLE" ]; then
                RunCommand "tizen build-native -a $ARCH_TYPE -c $COMPILER_TYPE -C $BUILD_TYPE -- $WORKSPACE_PATH/$PROJECT_NAME" "Building tpk $PROJECT_NAME"