1b094f6474
* commitHelper added my login * src/addrcache.c * src/addrharvest.c * src/addrindex.c * src/compose.c * src/grouplistdialog.c * src/main.c * src/mainwindow.c * src/msgcache.c * src/mutt.c * src/pine.c * src/prefs_account.c * src/prefs_themes.c * src/stock_pixmap.c * src/summaryview.c * src/gtk/about.c * src/gtk/logwindow.c removed deprecated glib and gdk stuff * src/plugins/pgpcore/select-keys.c convert attributes from locale to utf8
125 lines
3 KiB
Bash
125 lines
3 KiB
Bash
#!/bin/bash
|
|
args=`echo $@`
|
|
|
|
head -n 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}"
|
|
nextextra="$EXTRA_VERSION"
|
|
nextextratype="head"
|
|
rm /tmp/commitTool.tmp
|
|
|
|
IFS='
|
|
'
|
|
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 You have to update first
|
|
exit
|
|
fi;
|
|
if [ "$modif" != "" ]; then
|
|
echo $modif
|
|
fi;
|
|
done;
|
|
patchset="("
|
|
log=""
|
|
files=`cvs diff -uN $@ 2>/dev/null |grep ^Index`
|
|
name=`whoami`
|
|
#change if your login isn't your name
|
|
if [ "$name" == "claws" ]; then
|
|
name="paul";
|
|
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 --utc +%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`
|
|
nextversion=`echo $version | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
|
|
|
|
log="$log\t* $file\n"
|
|
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"
|
|
|
|
if [ "$EDITOR" == "" ]; then
|
|
EDITOR=vi
|
|
fi;
|
|
|
|
|
|
echo -e "#please complete the changelog entry below" > /tmp/logentry
|
|
echo -e -n $log >> /tmp/logentry
|
|
|
|
$EDITOR /tmp/logentry
|
|
|
|
echo "--8<----------"
|
|
grep -v "^#" /tmp/logentry > /tmp/log.tmp.$$ \
|
|
&& mv /tmp/log.tmp.$$ /tmp/logentry
|
|
echo >> /tmp/logentry
|
|
cat /tmp/logentry
|
|
|
|
echo "--8<----------"
|
|
if [ -f ChangeLog-gtk2.claws ]; then
|
|
chlog="ChangeLog-gtk2.claws"
|
|
elif [ -f ChangeLog.claws ]; then
|
|
chlog="ChangeLog.claws"
|
|
else
|
|
chlog="ChangeLog"
|
|
fi
|
|
echo -n "Is it ok (write to $chlog and update configure.ac) [y/N]?"
|
|
read ans
|
|
if [ "$ans" == "y" ]; then
|
|
mv $chlog $chlog.old
|
|
cat /tmp/logentry > $chlog
|
|
cat $chlog.old >> $chlog
|
|
rm $chlog.old
|
|
|
|
cat configure.ac | sed "s/^EXTRA_VERSION=.*/EXTRA_VERSION=$nextextra/" > configure.ac.new \
|
|
&& mv configure.ac.new configure.ac ;
|
|
|
|
echo "$patchset" >> PATCHSETS
|
|
|
|
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
|