[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-217-gc4bdb18

[Michal Čihař]

The branch, master has been updated
       via  c4bdb187033c908982e814af1b254d28ab3b1d3e (commit)
       via  105c33fe34136245ba47e36660000c882adc4052 (commit)
      from  bbc3d3debfc3ae86aaab661a536170293c7c9cf7 (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 scripts/create-release.sh |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 9023b96..269ef44 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -93,6 +93,7 @@ fi
 LC_ALL=C date -u > RELEASE-DATE-${version}
 
 # Building Documentation.txt
+echo "* Generating Documentation.txt"
 LC_ALL=C w3m -dump Documentation.html > Documentation.txt
 
 # Remove test directory from package to avoid Path disclosure messages
@@ -119,28 +120,28 @@ for kit in $KITS ; do
     for comp in $COMPRESSIONS ; do
         case $comp in
             tbz|tgz)
-                echo "Creating $name.tar"
+                echo "* Creating $name.tar"
                 tar cf $name.tar $name
                 if [ $comp = tbz ] ; then
-                    echo "Creating $name.tar.bz2"
+                    echo "* Creating $name.tar.bz2"
                     bzip2 -9k $name.tar
                 fi
                 if [ $comp = tgz ] ; then
-                    echo "Creating $name.tar.gz"
+                    echo "* Creating $name.tar.gz"
                     gzip -9c $name.tar > $name.tar.gz
                 fi
                 rm $name.tar
                 ;;
             zip)
-                echo "Creating $name.zip"
+                echo "* Creating $name.zip"
                 zip -q -9 -r $name.zip $name
                 ;;
             zip-7z)
-                echo "Creating $name.zip"
+                echo "* Creating $name.zip"
                 7za a -bd -tzip $name.zip $name > /dev/null
                 ;;
             7z)
-                echo "Creating $name.7z"
+                echo "* Creating $name.7z"
                 7za a -bd $name.7z $name > /dev/null
                 ;;
             *)
@@ -178,6 +179,14 @@ if [ $# -gt 0 ] ; then
                 tagname=RELEASE_`echo $version | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -`
                 echo "* Tagging release as $tagname"
                 git tag -a -m "Released $version" $tagname $branch
+                if echo $version | grep '[a-z_-]' ; then
+                    echo "* Tagging release as TESTING"
+                    git tag -a -f -m "Released $version" TESTING $branch
+                else
+                    echo "* Tagging release as STABLE"
+                    git tag -a -f -m "Released $version" STABLE $branch
+                fi
+                echo "   Dont forget to push tags using: git push --tags"
                 ;;
             *)
                 echo "Unknown parameter: $1!"


hooks/post-receive
-- 
phpMyAdmin