#!/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 -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='
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;
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;
+if [ "$name" == "devel" ]; then
+ name="mones";
+fi;
log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
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 >> /tmp/logentry
cat /tmp/logentry
+chlog="ChangeLog"
+
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
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
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