[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1830-g2146984

[Michal Čihař]

The branch, master has been updated
       via  21469844a5f7003034e43bf4f08db09d307a1b95 (commit)
       via  f4bedb04a9d73152c9c9943077018a1acaddfd52 (commit)
       via  b1f939ef58512c249f567e53d9965807ca26c8b5 (commit)
       via  ffebaad7573390fa3e7dbdf8717c899a50d0c229 (commit)
      from  e7547794e5a8badd79eda3d03f8af40d80d6783c (commit)


- Log -----------------------------------------------------------------
commit 21469844a5f7003034e43bf4f08db09d307a1b95
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Dec 7 14:44:42 2010 +0100

    Avoid creating tarball multiple times.

commit f4bedb04a9d73152c9c9943077018a1acaddfd52
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Dec 7 14:38:45 2010 +0100

    Remove some unneded scripts when creating a release.

commit b1f939ef58512c249f567e53d9965807ca26c8b5
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Dec 7 14:32:14 2010 +0100

    This file is no longer needed with gettext.

commit ffebaad7573390fa3e7dbdf8717c899a50d0c229
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Dec 7 14:30:14 2010 +0100

    Do not include javascript sources from release.

-----------------------------------------------------------------------

Summary of changes:
 scripts/create-release.sh       |   22 +++++++++++++++++++---
 scripts/find_unused_messages.sh |   35 -----------------------------------
 2 files changed, 19 insertions(+), 38 deletions(-)
 delete mode 100755 scripts/find_unused_messages.sh

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 3e7c2c1..3fb94c0 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -134,8 +134,11 @@ fi
 if [ -f ./scripts/compress-js ] ; then
     echo "* Compressing javascript files"
     ./scripts/compress-js
+    rm -rf sources
 fi
 
+echo "* Removing unneeded files"
+
 # Remove test directory from package to avoid Path disclosure messages
 # if someone runs /test/wui.php and there are test failures
 rm -rf test
@@ -143,6 +146,11 @@ rm -rf test
 # Remove javascript compiler, no need to ship it
 rm -rf scripts/google-javascript-compiler/
 
+# Remove scripts which are not useful for user
+for s in compress-js create-release.sh generate-mo mergepo.py php2gettext.sh remove_control_m.sh update-po upload-release ; do
+    rm -f scripts/$s
+done
+
 # Remove git metadata
 rm -rf .git
 find . -name .gitignore -print0 | xargs -0 -r rm -f
@@ -158,14 +166,20 @@ for kit in $KITS ; do
 	# Cleanup translations
     cd phpMyAdmin-$version-$kit
     scripts/lang-cleanup.sh $kit
+    rm -f scripts/lang-cleanup.sh
     cd ..
 
+    # Remove tar file possibly left from previous run
+    rm -f $name.tar
+
     # Prepare distributions
     for comp in $COMPRESSIONS ; do
         case $comp in
             tbz|tgz|txz)
-                echo "* Creating $name.tar"
-                tar cf $name.tar $name
+                if [ ! -f $name.tar ] ; then
+                    echo "* Creating $name.tar"
+                    tar cf $name.tar $name
+                fi
                 if [ $comp = tbz ] ; then
                     echo "* Creating $name.tar.bz2"
                     bzip2 -9k $name.tar
@@ -178,7 +192,6 @@ for kit in $KITS ; do
                     echo "* Creating $name.tar.gz"
                     gzip -9c $name.tar > $name.tar.gz
                 fi
-                rm $name.tar
                 ;;
             zip)
                 echo "* Creating $name.zip"
@@ -196,6 +209,9 @@ for kit in $KITS ; do
                 echo "WARNING: ignoring compression '$comp', not known!"
                 ;;
         esac
+
+        # Cleanup
+        rm -f $name.tar
     done
 
     # Remove directory with current dist set
diff --git a/scripts/find_unused_messages.sh b/scripts/find_unused_messages.sh
deleted file mode 100755
index bf01ffc..0000000
--- a/scripts/find_unused_messages.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-export LANG=C
-set -e
-
-# Simple script to find unused message strings by Michal Čihař
-
-tmp1=`mktemp`
-tmp2=`mktemp`
-grep -o '^\$\<str[A-Z][a-zA-Z0-9_]*\>' libraries/messages.inc.php \
-    | tr -d '$' \
-    | grep -Ev '^str(Transformation_|ShowStatus)' | sort -u > $tmp1
-grep -ho '\<str[A-Z][a-zA-Z0-9_]*\>' `find . -type f -a -name '*.php' -a -not -path '*/libraries/messages.inc.php' -a -not -path '*/js/messages.php' -a -not -path '*.js'` \
-    | grep -Ev '^str(Transformation_|ShowStatus|Setup)' | sort -u > $tmp2
-
-echo Please note that you need to check results of this script, it doesn\'t
-echo understand PHP, it only tries to find what looks like message name.
-
-echo
-echo Used messages not present in messages file:
-echo '(this contains generated messages and composed message names, so these'
-echo 'are not necessary a errors!)'
-echo
-
-# filter out known false positives
-diff $tmp1 $tmp2 | awk '/^>/ {print $2}' | grep -Ev '(strEncto|strXkana|strDBLink|strPrivDesc|strPrivDescProcess|strTableListOptions|strMissingParameter|strAttribute|strDoSelectAll)'
-
-echo
-echo Not used messages present in messages file:
-echo
-
-diff $tmp1 $tmp2 | awk '/^</ {print $2}' | grep -Ev '(strConfig.*_(desc|name)|strConfigForm_|strConfigFormset_)'
-
-
-rm -f $tmp1 $tmp2


hooks/post-receive
-- 
phpMyAdmin