full support for p? / t?, update tests for M60P M60T

share/eterbuild/functions/alt

@@ -15,7 +15,7 @@ is_alt()
 set_target_type()
 {
 	# check for M51 and so on
-	if echo $1 | grep "^M[0-9][0-9]$" >/dev/null ; then
+	if echo $1 | grep "^M[0-9][0-9].$" >/dev/null ; then
 		MENV=$1
 		return 0
 	fi
@@ -32,7 +32,7 @@ set_target_type()
 get_type_by_git_branch_name()
 {
         # like p5
-        if echo $1 | grep -q "^p[0-9]$" ; then
+        if echo $1 | grep -q "^[pt][0-9]$" ; then
                 get_altdistr_mod $1
                 return
         fi
@@ -44,7 +44,7 @@ get_type_by_git_branch_name()
         fi
 
         # like M50
-        if echo $1 | grep -q "^M[0-9][0-9]$" ; then
+        if echo $1 | grep -q "^M[0-9][0-9].$" ; then
                 echo $1
                 return
         fi
@@ -70,10 +70,10 @@ set_binaryrepo()
 	BINARYREPO="`get_altdistr_version $1`"
 }
 
-# M50 -> 5.0
+# M50 -> 5.0, M60P -> p6
 get_altdistr_version()
 {
-	echo "$1" | sed -e "s|M\([5-9]\)0|p\1|g" | sed -e "s|M\([0-9]\)\([0-9]\)|\1\.\2|g" | sed -e "s|SS|sisyphus|g" | sed -e "s|DD|daedalus|g" | sed -e "s|Sisyphus|sisyphus|g"
+	echo "$1" | sed -e "s|M\([5-9]\)0P|p\1|g" -e "s|M\([5-9]\)0T|t\1|g" -e "s|M\([0-9]\)\([0-9]\)|\1\.\2|g" -e "s|SS|sisyphus|g" -e "s|DD|daedalus|g" -e "s|Sisyphus|sisyphus|g"
 }
 
 # 5.0 -> M50

tests/transf_altdistrversion.sh

@@ -27,7 +27,8 @@ echo "Check get_altdistr_version"
 check_AD M40 4.0
 check_AD M30 3.0
 check_AD M41 4.1
-check_AD M50 p5
+check_AD M50P p5
+check_AD M60T t6
 check_AD M51 5.1
 check_AD  SS sisyphus
 
@@ -38,12 +39,15 @@ check_MOD 4.0 M40
 check_MOD 4.1 M41
 check_MOD 5.0 M50
 check_MOD 5.1 M51
-check_MOD  p5 M50
-check_MOD  p6 M60
+check_MOD  p5 M50P
+check_MOD  p6 M60P
+check_MOD  t6 M60T
 check_MOD Sisyphus SS
 check_MOD sisyphuS SS
 
-check_GN M50 M50
+check_GN M50P M50P
 check_GN 5.0 M50
-check_GN p5 M50
-check_GN p7 M70
+check_GN p5 M50P
+check_GN p6 M60P
+check_GN t6 M60T
+check_GN p7 M70P