Switch to unified view

a/src/makesrcdist.sh b/src/makesrcdist.sh
...
...
5
fatal() {
5
fatal() {
6
    echo $*
6
    echo $*
7
    exit 1
7
    exit 1
8
}
8
}
9
usage() {
9
usage() {
10
    echo 'Usage: [dotag=no] makescrdist.sh do_it'
10
    echo 'Usage: makescrdist.sh -t -s do_it'
11
    echo ' -t : no tagging'
12
    echo ' -s : snapshot release: use date instead of VERSION'
13
    echo ' -s implies -t'
11
    exit 1
14
    exit 1
12
}
15
}
13
tagtopsvn() {
16
tagtopsvn() {
14
    (cd ..; svn copy -m "Release $version tagged" . $SVNREPOS/tags/$1) \
17
    (cd ..; svn copy -m "Release $version tagged" . $SVNREPOS/tags/$1) \
15
        || fatal tag failed
18
        || fatal tag failed
...
...
23
tagtop() {
26
tagtop() {
24
    tagtophg $*
27
    tagtophg $*
25
}
28
}
26
29
27
#set -x
30
#set -x
28
test $# -eq 1 || usage
29
31
30
TAR=/usr/bin/tar
32
TAR=/usr/bin/tar
31
33
32
#VCCMD=svn
34
#VCCMD=svn
33
#SVNREPOS=svn+ssh://y/home/subversion/recoll/
35
#SVNREPOS=svn+ssh://y/home/subversion/recoll/
...
...
38
    echo "Should be executed in the master recoll directory"
40
    echo "Should be executed in the master recoll directory"
39
    exit 1
41
    exit 1
40
fi
42
fi
41
targetdir=${targetdir-/tmp}
43
targetdir=${targetdir-/tmp}
42
dotag=${dotag-yes}
44
dotag=${dotag-yes}
45
snap=${snap-no}
46
47
while getopts ts o
48
do    case "$o" in
49
  t)  dotag=no;;
50
  s)  snap=yes;dotag=no;;
51
  [?])    usage;;
52
  esac
53
done
54
shift `expr $OPTIND - 1`
55
56
test $dotag = "yes" -a $snap = "yes" && usage
57
58
test $# -eq 1 || usage
59
60
echo dotag $dotag snap $snap
61
62
if test $snap = yes ; then
63
  version=`date +%s`
64
  versionforcvs=$version
65
  TAG=""
66
else
43
version=`cat VERSION`
67
  version=`cat VERSION`
44
versionforcvs=`echo $version | sed -e 's/\./_/g'`
68
  versionforcvs=`echo $version | sed -e 's/\./_/g'`
45
TAG="RECOLL_$versionforcvs"
69
  TAG="RECOLL_$versionforcvs"
70
fi
46
71
47
if test "$dotag" = "yes" ; then
72
if test "$dotag" = "yes" ; then
48
  echo Creating AND TAGGING version $versionforcvs
73
  echo Creating AND TAGGING version $versionforcvs
49
else
74
else
50
  echo Creating version $versionforcvs, no tagging
75
  echo Creating version $versionforcvs, no tagging