2005-10-08 [colin] 1.9.15cvs24

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index d1715e93bea9e348abf16850260e27b984f40f59..667bc60f619463f6ae6beb1d19852f6a06dc14ce 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -1,39 +1,29 @@
 #!/bin/bash
-if [ "$1" == "--syncgtk2" ]; then
-       shift
-       echo -n "sync with EXTRA_VERSION ? [xx] "
-       read newmicro
-       cat configure.ac | sed "s/^EXTRA_VERSION=.*/EXTRA_VERSION=$newmicro/" > configure.ac.new \
-               && mv configure.ac.new configure.ac ;   
-       cat configure.ac | sed "s/^EXTRA_GTK2_VERSION=.*/EXTRA_GTK2_VERSION=.0/" > configure.ac.new \
-               && mv configure.ac.new configure.ac ;   
-fi;
+args=`echo $@`
 
-head -16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
+head -n 16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
 source /tmp/commitTool.tmp
-if [ -z "$EXTRA_GTK2_VERSION" ]; then
-       EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
-       nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}"
-       nextextra="$EXTRA_VERSION"
-       nextextratype="head"
-else
-       EXTRA_GTK2_VERSION=`echo $EXTRA_GTK2_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
-       nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}${EXTRA_GTK2_VERSION}"
-       nextextra="$EXTRA_GTK2_VERSION"
-       nextextratype="gtk2"
-fi
+EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
+nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}"
+nextextra="$EXTRA_VERSION"
+nextextratype="head"
 rm /tmp/commitTool.tmp
 
 IFS='
 '
-filelist=`cvs status $@ 2>/dev/null |grep ^File`
+filelist=`cvs status $@ configure.ac 2>/dev/null |grep ^File`
 
 for file in $filelist; do
        merge=`echo $file | grep Merge`
        modif=`echo $file | grep Locally`
-
+       patch=`echo $file | grep Patch`
+       if [ "$patch" != "" ]; then
+               echo $patch 
+               echo You have to update first
+               exit
+       fi;
        if [ "$merge" != "" ]; then
-               echo $merge
+               echo $merge 
                echo You have to update first
                exit
        fi;
@@ -43,8 +33,7 @@ for file in $filelist; do
 done;
 patchset="("
 log=""
-files=`cvs diff -u $@ 2>/dev/null |grep ^Index`
-echo "--8<----------"
+files=`cvs diff -uN $@ 2>/dev/null |grep ^Index`
 name=`whoami`
 #change if your login isn't your name
 if [ "$name" == "claws" ]; then
@@ -53,8 +42,23 @@ fi;
 if [ "$name" == "reboot" ]; then
        name="christoph";
 fi;
+if [ "$name" == "leroyc" ]; then
+       name="colin";
+fi;
+if [ "$name" == "torte" ]; then
+       name="thorsten";
+fi;
+if [ "$name" == "dinh" ]; then
+       name="hoa";
+fi;
+if [ "$name" == "f" -o "$name" == "darkok" ]; then
+       name="darko";
+fi;
+if [ "$name" == "msp" ]; then
+       name="martin";
+fi;
 
-log="`date +%Y-%m-%d` [$name]\t$nextsversion\n\n"
+log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
 for line in $files; do
        file=`echo $line | cut -d' ' -f2`
        dir=`dirname $file`
@@ -64,19 +68,26 @@ for line in $files; do
        nextversion=`echo $version | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
        
        log="$log\t* $file\n"
-       patchset="$patchset cvs diff -u -r $version -r $nextversion $file;\
-"
+       if [ "$version" != "0" ]; then
+       patchset="$patchset cvs diff -u -r $version -r $nextversion $file; "
+       else
+       patchset="$patchset diff -u /dev/null $file; "
+       fi
 done;
 patchset="$patchset ) > $nextsversion.patchset"
-echo -e -n $log
 
 if [ "$EDITOR" == "" ]; then
        EDITOR=vi
 fi;
 
-echo -e "\n#please type in the changelog entry" > /tmp/logentry
+
+echo -e "#please complete the changelog entry below" > /tmp/logentry
+echo -e -n $log >> /tmp/logentry
+
 $EDITOR /tmp/logentry
-grep -v "^#" /tmp/logentry |grep -v "^$" | sed "s/^/           /" > /tmp/log.tmp.$$ \
+
+echo "--8<----------"
+grep -v "^#" /tmp/logentry > /tmp/log.tmp.$$ \
 && mv /tmp/log.tmp.$$ /tmp/logentry
 echo >> /tmp/logentry
 cat /tmp/logentry
@@ -93,27 +104,22 @@ echo -n "Is it ok (write to $chlog and update configure.ac) [y/N]?"
 read ans
 if [ "$ans" == "y" ]; then
        mv $chlog $chlog.old
-       echo -e -n $log > $chlog
-       cat /tmp/logentry >> $chlog
+       cat /tmp/logentry > $chlog
        cat $chlog.old >> $chlog
        rm $chlog.old
 
-       if [ "$nextextratype" == "head" ]; then
-               cat configure.ac | sed "s/^EXTRA_VERSION=.*/EXTRA_VERSION=$nextextra/" > configure.ac.new \
-               && mv configure.ac.new configure.ac ;
-       else
-               cat configure.ac | sed "s/^EXTRA_GTK2_VERSION=.*/EXTRA_GTK2_VERSION=$nextextra/" > configure.ac.new \
-               && mv configure.ac.new configure.ac ;
-       fi;
+       cat configure.ac | sed "s/^EXTRA_VERSION=.*/EXTRA_VERSION=$nextextra/" > configure.ac.new \
+       && mv configure.ac.new configure.ac ;
        
        echo "$patchset" >> PATCHSETS
 
-       if [ "$@" != "" ]; then
+       if [ "$args" != "" ]; then
                echo commiting $@ PATCHSETS $chlog configure.ac
                cvs commit -m "`cat /tmp/logentry`" $@ PATCHSETS $chlog configure.ac
        else
                echo commiting recursively
                cvs commit -m "`cat /tmp/logentry` "
        fi;
+       rm -f /tmp/logentry
+       wget -O /dev/null -o /dev/null http://www.colino.net/sylpheed-claws-gtk2/update.php3
 fi
-rm -f /tmp/logentry