generalize a bit

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index b46bfd84902007843d70faeacf1c103863b81234..fcde9d92b0a022bd17ab8fbfcc31d3483e5aaa65 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -1,8 +1,13 @@
 #!/bin/sh
-head -15 configure.ac | grep VERSION > /tmp/commitTool.tmp
+head -16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
 source /tmp/commitTool.tmp
-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}"
+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}"
+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}"
+fi
 rm /tmp/commitTool.tmp
 
 IFS='
@@ -26,16 +31,21 @@ patchset="("
 log=""
 files=`cvs diff -u $@ 2>/dev/null |grep ^Index`
 echo "--8<----------"
-log="`date +%Y-%m-%d` [`whoami`]\t$nextsversion\n\n"
+name=`whoami`
+#change if your login isn't your name
+if [ "$name" == "claws" ]; then
+       name="paul";
+fi;
+log="`date +%Y-%m-%d` [$name]\t$nextsversion\n\n"
 for line in $files; do
        file=`echo $line | cut -d' ' -f2`
        dir=`dirname $file`
        filename=`basename $file`
        cvsfile="$dir/CVS/Entries"
-       version=`grep $filename $cvsfile | cut -d'/' -f3`
+       version=`grep "\/$filename\/" $cvsfile | cut -d'/' -f3`
        nextversion=`echo $version | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
        
-       log="$log\t* $file [$nextversion]\n"
+       log="$log\t* $file\n"
        patchset="$patchset cvs diff -u -r $version -r $nextversion $file;\
 "
 done;
@@ -45,8 +55,10 @@ echo -e -n $log
 echo "--8<----------"
 if [ -f ChangeLog-gtk2.claws ]; then
        chlog="ChangeLog-gtk2.claws"
-else
+elif [ -f ChangeLog.claws ]; then
        chlog="ChangeLog.claws"
+else
+       chlog="ChangeLog"
 fi
 echo -n "Is it ok (write to $chlog) [y/N]?"
 read ans
@@ -56,4 +68,11 @@ if [ "$ans" == "y" ]; then
        cat $chlog.old >> $chlog
        rm $chlog.old
        echo "$patchset" >> PATCHSETS
+       echo "editing $chlog configure.ac..."
+       if [ "$EDITOR" == "" ]; then
+               EDITOR=vi
+       fi;
+       $EDITOR $chlog configure.ac
+       echo running cvs commit $@ PATCHSETS $chlog configure.ac
+       cvs commit $@ PATCHSETS $chlog configure.ac
 fi