From: Nibha Sharma Date: Fri, 5 Jun 2020 08:14:13 +0000 (+0530) Subject: [TBT][Script][Non-ACR][tbt multipackage tpk installation certificate error fixed... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F235528%2F2;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][Script][Non-ACR][tbt multipackage tpk installation certificate error fixed, rootstrap check added and arch i586 handling is added] Change-Id: Ia0729dea178844361a07230994c4c5508c8e2f07 Signed-off-by: Nibha Sharma --- diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh index 15cc8de..ea04066 100755 --- a/scripts_tpk/tpk_create.sh +++ b/scripts_tpk/tpk_create.sh @@ -124,6 +124,44 @@ deploySourceFile() { cd $2/../scripts_tpk } +checkRootstrap() { + ROOTSTRAP_TYPE=$1 + PROFILE_TYPE=$2 + DEVICE_TYPE=$3 + CURRENT_VERSION=$4 + if [ -z "$ROOTSTRAP_TYPE" ]; then + echo $yellow"rootstrap.txt file is empty."$reset + EXISTING_ROOTSTRAP=`tizen list rootstrap | grep "${PROFILE_TYPE}" | grep "${DEVICE_TYPE}" | grep "${CURRENT_VERSION}" | cut -f1 -d' ' |grep -v "public"` + if [ -z "$EXISTING_ROOTSTRAP" ]; then + echo $red"Default rootstrap is not installed for ${CURRENT_VERSION} version"$reset + OPTIONAL_ROOTSTRAP=`tizen list rootstrap | grep "${PROFILE_TYPE}" | grep "${DEVICE_TYPE}" | grep "${CURRENT_VERSION}" | cut -f1 -d' ' |grep -i "public"` + if [ -z "$OPTIONAL_ROOTSTRAP" ]; then + echo $red"Please install the rootstrap."$reset + exit + else + echo $red"****Please run tizen list rootstrap command to check available rootstrap and update rootstrap.txt file ${BUILD_PROFILE}_$ARCH tag"$reset + exit + fi + else + echo $green$EXISTING_ROOTSTRAP" rootstrap is present and used."$reset + fi + else + EXISTING_ROOTSTRAP=`tizen list rootstrap | grep "${ROOTSTRAP_TYPE}" | grep "${DEVICE_TYPE}" | grep "${CURRENT_VERSION}" |cut -f1 -d' '` + if echo "$ROOTSTRAP_TYPE" | grep -q "$CURRENT_VERSION";then + echo $green"Version of branch and rootstrap is same."$reset + else + ROOTSTRAP_VERSION=$(echo "$ROOTSTRAP_TYPE" | cut -f2 -d'-') + echo $red"Version mismatch. Code branch version: "${CURRENT_VERSION}" and rootstrap.txt file contain rootstrap version: ${ROOTSTRAP_VERSION}"$reset + exit + fi + if [ -z "$EXISTING_ROOTSTRAP" ]; then + echo $red$ROOTSTRAP_TYPE" rootstrap mentioned in rootstrap.txt is not installed.Please install the rootstrap."$reset + exit + else + echo $green$EXISTING_ROOTSTRAP" rootstrap is present and used."$reset + fi + fi +} PWD=$(pwd) SRC_DIRCTORY=$PWD HOME_DIR=$( getent passwd "sri" | cut -d: -f6 ) @@ -132,6 +170,7 @@ MODULE_NAME="$2" ARCH_TYPE="$3" APPLLICATION_PROFILE="basic-ui" PROFILE_TYPE="$4" +CURRENT_VERSION="6.0" WORKSPACE_PATH="$HOME_DIR/workspace_$PROFILE_TYPE" if [ $MODULE_NAME == "coretbt_serviceapp" ]; then @@ -146,7 +185,7 @@ fi # build command properties #COMPILER_TYPE="llvm" if [[ ( $MODULE_NAME =~ "dali-" ) || ( $MODULE_NAME =~ "-dali" ) ]]; then - COMPILER_TYPE="gcc-6.2" + COMPILER_TYPE="gcc" elif [ "$ARCH_TYPE" == "arm" ]; then COMPILER_TYPE="gcc-6.2" else @@ -193,6 +232,7 @@ BUILD_PROFILE="mobile" ROOTSTRAP_FILE=$(readlink -f rootstrap.txt) ROOTSTRAP_MOBILE=`cat $ROOTSTRAP_FILE | grep "${BUILD_PROFILE}_$ARCH:" | cut -f 2- -d ':'` +checkRootstrap "$ROOTSTRAP_MOBILE" $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION RunCommand "tizen create native-project -p $BUILD_PROFILE-5.0 -t $APPLLICATION_PROFILE -n $PROJECT_NAME -- $WORKSPACE_PATH" "Project creation $PROJECT_NAME" deploySourceFile "$WORKSPACE_PATH/$PROJECT_NAME" "$SRC_DIRCTORY/$MODULE_NAME" "$PROFILE_TYPE" "$PROJECT_NAME" "$TESTCASE_TYPE" "$MODULE_NAME" @@ -219,7 +259,7 @@ if [ -z "$ROOTSTRAP_MOBILE" ]; then if [ $MODULE_NAME == "tbtcoreapp" ]; then cd $WORKSPACE_PATH chmod -R 777 * - sudo tizen build-app -m "name:m1,compiler:$COMPILER_TYPE,rootstraps:[{"name":$ROOTSTRAP_MOBILE,"platform":$BUILD_PROFILE,"arch":$ARCH_TYPE}],configs:[Debug]" -b "name:b1,targets:[tbtcoreapp,coretbt_serviceapp],methods:[m1]" -p "name:tbtcoreapp,targets:[b1]" --sign test + tizen build-app -m "name:m1,compiler:$COMPILER_TYPE,rootstraps:[{"name":$ROOTSTRAP_MOBILE,"platform":$BUILD_PROFILE,"arch":$ARCH_TYPE}],configs:[Debug]" -b "name:b1,targets:[tbtcoreapp,coretbt_serviceapp],methods:[m1]" -p "name:tbtcoreapp,targets:[b1]" --sign test cd $SRC_DIRCTORY else RunCommand "tizen build-native -a $ARCH_TYPE -c $COMPILER_TYPE -C $BUILD_TYPE -- $WORKSPACE_PATH/$PROJECT_NAME" "Building tpk $PROJECT_NAME" @@ -229,7 +269,7 @@ else if [ $MODULE_NAME == "tbtcoreapp" ]; then cd $WORKSPACE_PATH chmod -R 777 * - sudo tizen build-app -m "name:m1,compiler:$COMPILER_TYPE,rootstraps:[{"name":$ROOTSTRAP_MOBILE,"platform":$BUILD_PROFILE,"arch":$ARCH_TYPE}],configs:[Debug]" -b "name:b1,targets:[tbtcoreapp,coretbt_serviceapp],methods:[m1]" -p "name:tbtcoreapp,targets:[b1]" --sign test + tizen build-app -m "name:m1,compiler:$COMPILER_TYPE,rootstraps:[{"name":$ROOTSTRAP_MOBILE,"platform":$BUILD_PROFILE,"arch":$ARCH_TYPE}],configs:[Debug]" -b "name:b1,targets:[tbtcoreapp,coretbt_serviceapp],methods:[m1]" -p "name:tbtcoreapp,targets:[b1]" --sign test cd $SRC_DIRCTORY else RunCommand "tizen build-native -r $ROOTSTRAP_MOBILE -a $ARCH_TYPE -c $COMPILER_TYPE -C $BUILD_TYPE -- $WORKSPACE_PATH/$PROJECT_NAME" "Building tpk $PROJECT_NAME" @@ -237,16 +277,41 @@ else fi fi -echo $green"" -echo " ============================================" -echo "|| "$bold"CREATION SUCCESSFUL$reset$green ||" -echo " ============================================" -echo ""$reset - if [ $MODULE_NAME == "tbtcoreapp" ]; then - mv $WORKSPACE_PATH/tbtcoreapp*.tpk $WORKSPACE_PATH/$PROJECT_NAME/$BUILD_TYPE/org.tizen.tbtcoreapp-1.0.0-$ARCH_TYPE.tpk -fi + tpkExist=$(ls $WORKSPACE_PATH/tbtcoreapp*.tpk | wc -l) + if [ "$tpkExist" == "0" ]; then + echo $red"" + echo " ============================================" + echo "|| "$bold"CREATION Fail$reset$red ||" + echo " ============================================" + echo ""$reset + exit + else + echo $green"" + echo " ============================================" + echo "|| "$bold"CREATION SUCCESSFUL$reset$green ||" + echo " ============================================" + echo ""$reset + mv $WORKSPACE_PATH/tbtcoreapp*.tpk $WORKSPACE_PATH/$PROJECT_NAME/$BUILD_TYPE/org.tizen.tbtcoreapp-1.0.0-$ARCH_TYPE.tpk + fi +else + echo $green"" + echo " ============================================" + echo "|| "$bold"CREATION SUCCESSFUL$reset$green ||" + echo " ============================================" + echo ""$reset + tpkOriginal=$(ls $WORKSPACE_PATH/$PROJECT_NAME/$BUILD_TYPE/*.tpk) + generatedtpkname="$(echo $tpkOriginal | cut -d'/' -f5)" + if [[ $generatedtpkname =~ "i586" ]]; then + renamedtpk=$(echo "$generatedtpkname" | sed "s/i586/x86/") + elif [[ $generatedtpkname =~ "i686" ]];then + renamedtpk=$(echo "$generatedtpkname" | sed "s/i686/x86/") + fi + if [ "$ARCH_TYPE" == "x86" ]; then + mv $WORKSPACE_PATH/$PROJECT_NAME/$BUILD_TYPE/$generatedtpkname $WORKSPACE_PATH/$PROJECT_NAME/$BUILD_TYPE/$renamedtpk + fi +fi cp -rf $WORKSPACE_PATH/$PROJECT_NAME/$BUILD_TYPE/*.tpk $SRC_DIRCTORY/release/binary-$ARCH/. chmod -R 777 $SRC_DIRCTORY/release/binary-$ARCH/*