Switch to unified view

a/src/makesrcdist.sh b/src/makesrcdist.sh
...
...
36
36
37
if test ! -d qtgui;then
37
if test ! -d qtgui;then
38
    echo "Should be executed in the master recoll directory"
38
    echo "Should be executed in the master recoll directory"
39
    exit 1
39
    exit 1
40
fi
40
fi
41
41
targetdir=${targetdir-/tmp}
42
dotag=${dotag-yes}
42
version=`cat VERSION`
43
version=`cat VERSION`
43
versionforcvs=`echo $version | sed -e 's/\./_/g'`
44
versionforcvs=`echo $version | sed -e 's/\./_/g'`
44
TAG="RECOLL_$versionforcvs"
45
TAG="RECOLL_$versionforcvs"
45
46
47
if test "$dotag" = "yes" ; then
46
echo Creating version $versionforcvs
48
  echo Creating AND TAGGING version $versionforcvs
49
else
50
  echo Creating version $versionforcvs, no tagging
51
fi
47
sleep 2
52
sleep 2
48
tagexists $TAG  && fatal "Tag $TAG already exists"
53
tagexists $TAG  && fatal "Tag $TAG already exists"
49
54
50
editedfiles=`$VCCMD status . | egrep -v '^\?'`
55
editedfiles=`$VCCMD status . | egrep -v '^\?'`
51
if test ! -z "$editedfiles"; then
56
if test "$dotag" = "yes" -a ! -z "$editedfiles"; then
52
  fatal  "Edited files exist: " $editedfiles
57
  fatal  "Edited files exist: " $editedfiles
53
fi
58
fi
54
59
55
targetdir=${targetdir-/tmp}
56
dotag=${dotag-yes}
57
60
58
case $version in
61
case $version in
59
*.*.*) releasename=recoll-$version;;
62
*.*.*) releasename=recoll-$version;;
60
*) releasename=betarecoll-$version;;
63
*) releasename=betarecoll-$version;;
61
esac
64
esac
...
...
128
        gzip > $out)
131
        gzip > $out)
129
echo "$targetdir/$out created"
132
echo "$targetdir/$out created"
130
133
131
# Check manifest against current reference
134
# Check manifest against current reference
132
tar tzf $targetdir/$out | sort | cut -d / -f 2- | \
135
tar tzf $targetdir/$out | sort | cut -d / -f 2- | \
133
    diff mk/manifest.txt - || fatal "Please fix file list"
136
    diff mk/manifest.txt - || fatal "Please fix file list mk/manifest.txt"
134
137
135
# We tag .. as there is the 'packaging/' directory in there
138
# We tag .. as there is the 'packaging/' directory in there
136
[ $dotag = "yes" ] && tagtop $TAG
139
[ $dotag = "yes" ] && tagtop $TAG