new release scripts

ChangeLog

@@ -5,6 +5,20 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-10-07 Marc Delisle  <lem9@users.sourceforge.net>
+    * scripts/create-release.sh: use lang-cleanup.sh from the kit,
+      list all files, and allow non-anonymous access
+
+2006-10-06 Michal Čihař  <michal@cihar.com>
+    * scripts/lang-cleanup.sh: Script for removing not installed languages
+      from libraries/select_lang.lib.php.
+    * scripts/create-release.sh: Make it better :-):
+        - Create 7z archives
+        - Make compression list configurable
+        - Allow to define which kits to build
+        - Call scripts/lang-cleanup.sh to remove not wanted languages
+        - Do not login to cvs if already logged in
+
 2006-10-03 Marc Delisle  <lem9@users.sourceforge.net>
     ### 2.9.0.2 released from MAINT_2_9_0
 

scripts/create-release.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # $Id$
+# vim: expandtab sw=4 ts=4 sts=4:
 #
 # 2005-09-13, lem9@users.sourceforge.net
 # - no longer create a config.default.php from config.inc.php
@@ -67,25 +68,37 @@
 # - added release todo list
 #
 
-cvsserver=${cvsserver:-phpmyadmin.cvs}
+cvsserver=${cvsserver:-phpmyadmin.cvs.sourceforge.net}
+KITS="all-languages-utf-8-only all-languages english"
+COMPRESSIONS="zip-7z tbz tgz 7z"
+
+# third param is the user; when creating a release we don't want
+# to suffer from the delay between anonymous cvs and developer cvs
 
 if [ $# = 0 ]
 then
-  echo "Usage: create-release.sh version from_branch"
+  echo "Usage: create-release.sh version from_branch devname"
   echo "  (no spaces allowed!)"
   echo ""
-  echo "Example: create-release.sh 2.2.7-rc1 v2_2_7-branch"
+  echo "Example: create-release.sh 2.9.0-rc1 QA_2_9 lem9"
   exit 65
 fi
 
 if [ "$1" = "snapshot" ]
 then
   branch=''
-elif [ "$#" = 2 ]
+elif [ "$#" -ge 2 ]
 then
   branch="-r $2"
 fi
 
+user="anonymous"
+if [ "$#" -eq 3 ]
+then
+    user=$3
+fi
+
+
 if [ $1 = "snapshot" ]
 then
   mode="snapshot"
@@ -153,8 +166,11 @@ fi
 mkdir cvs
 cd cvs
 
-if [ "$mode" != "snapshot" ]
+if [ "$mode" != "snapshot" ] ; then
-then
+    if grep -Fq ':pserver:anonymous@phpmyadmin.cvs.sourceforge.net:2401/cvsroot/phpmyadmin' ~/.cvspass ; then
+        echo "You seem to be already logged into phpMyAdmin CVS, skipping that"
+    else
+        if [ $user = "anonymous" ] ; then
             echo "Press [ENTER]!"
             cvs -q -d:pserver:anonymous@$cvsserver:/cvsroot/phpmyadmin login
             if [ $? -ne 0 ] ; then
@@ -162,8 +178,14 @@ then
                 exit 1
             fi
         fi
+    fi
+fi
 
+if [ $user = "anonymous" ] ; then
     cvs -q -z3 -d:pserver:anonymous@$cvsserver:/cvsroot/phpmyadmin co -P $branch phpMyAdmin
+else
+    cvs -q -z3 -d:ext:$user@$cvsserver:/cvsroot/phpmyadmin co -P $branch phpMyAdmin
+fi
 
 if [ $? -ne 0 ] ; then
     echo "CVS checkout failed, bailing out"
@@ -190,11 +212,54 @@ LC_ALL=C w3m -dump phpMyAdmin/Documentation.html > phpMyAdmin/Documentation.txt
 # Renaming directory
 mv phpMyAdmin phpMyAdmin-$target
 
-# Building distribution kits
+# Prepare all kits
-zip -9 -r phpMyAdmin-${target}.zip phpMyAdmin-${target}
+for kit in $KITS ; do
-tar cvf phpMyAdmin-${target}.tar phpMyAdmin-${target}
+    # Copy all files
-bzip2 -9kv phpMyAdmin-${target}.tar
+	name=phpMyAdmin-$target-$kit
-gzip -9v phpMyAdmin-${target}.tar
+	cp -r phpMyAdmin-$target $name
+
+	# Cleanup translations
+    cd phpMyAdmin-$target-$kit
+    scripts/lang-cleanup.sh $kit
+    cd ..
+
+    # Prepare distributions
+    for comp in $COMPRESSIONS ; do
+        case $comp in
+            tbz|tgz)
+                echo "Creating $name.tar"
+                tar cf $name.tar $name
+                if [ $comp = tbz ] ; then
+                    echo "Creating $name.tar.bz2"
+                    bzip2 -9k $name.tar
+                fi
+                if [ $comp = tgz ] ; then
+                    echo "Creating $name.tar.gz"
+                    gzip -9c $name.tar > $name.tar.gz
+                fi
+                rm $name.tar
+                ;;
+            zip)
+                echo "Creating $name.zip"
+                zip -q -9 -r $name.zip $name
+                ;;
+            zip-7z)
+                echo "Creating $name.zip"
+                7za a -bd -tzip $name.zip $name > /dev/null
+                ;;
+            7z)
+                echo "Creating $name.7z"
+                7za a -bd $name.7z $name > /dev/null
+                ;;
+            *)
+                echo "WARNING: ignoring compression '$comp', not known!"
+                ;;
+        esac
+    done
+
+    # Remove directory with current dist set
+    rm -rf $name
+done
 
 # Cleanup
 rm -rf phpMyAdmin-${target}
@@ -209,19 +274,19 @@ echo ""
 echo "Files:"
 echo "------"
 
-ls -la *.gz *.zip *.bz2
+ls -la *.gz *.zip *.bz2 *.7z
 
 echo
 echo "MD5 sums:"
 echo "--------"
 
-md5sum *.{gz,zip,bz2} | sed "s/\([^ ]*\)[ ]*\([^ ]*\)/\$md5sum['\2'] = '\1';/"
+md5sum *.{gz,zip,bz2,7z} | sed "s/\([^ ]*\)[ ]*\([^ ]*\)/\$md5sum['\2'] = '\1';/"
 
 echo
 echo "Sizes:"
 echo "------"
 
-ls -l --block-size=k *.{gz,zip,bz2} | sed -r "s/[a-z-]+[[:space:]]+[0-9]+[[:space:]]+[^[:space:]]+[[:space:]]+[^[:space:]]+[[:space:]]+([0-9]*)K.*[[:space:]]([^[:space:]]+)\$/\$size['\2'] = \1;/"
+ls -l --block-size=k *.{gz,zip,bz2,7z} | sed -r "s/[a-z-]+[[:space:]]+[0-9]+[[:space:]]+[^[:space:]]+[[:space:]]+[^[:space:]]+[[:space:]]+([0-9]*)K.*[[:space:]]([^[:space:]]+)\$/\$size['\2'] = \1;/"
 
 echo
 echo "Add these to /home/groups/p/ph/phpmyadmin/htdocs/home_page/files.inc.php on sf"