Switch to unified view

a/src/makesrcdist.sh b/src/makesrcdist.sh
...
...
27
    tagtophg $*
27
    tagtophg $*
28
}
28
}
29
29
30
#set -x
30
#set -x
31
31
32
TAR=/usr/bin/tar
32
TAR=${TAR-/bin/tar}
33
33
34
#VCCMD=svn
34
#VCCMD=svn
35
#SVNREPOS=svn+ssh://y/home/subversion/recoll/
35
#SVNREPOS=svn+ssh://y/home/subversion/recoll/
36
36
37
VCCMD=hg
37
VCCMD=hg
...
...
121
EOF
121
EOF
122
122
123
echo "Dumping html documentation to text files"
123
echo "Dumping html documentation to text files"
124
links -dump ${RECOLLDOC}/usermanual.html >> README
124
links -dump ${RECOLLDOC}/usermanual.html >> README
125
125
126
links -dump ${RECOLLDOC}/rcl.install.html >> INSTALL
126
links -dump ${RECOLLDOC}/RCL.INSTALL.html >> INSTALL
127
links -dump ${RECOLLDOC}/rcl.install.external.html >> INSTALL
127
links -dump ${RECOLLDOC}/RCL.INSTALL.EXTERNAL.html >> INSTALL
128
links -dump ${RECOLLDOC}/rcl.install.building.html >> INSTALL
128
links -dump ${RECOLLDOC}/RCL.INSTALL.BUILDING.html >> INSTALL
129
links -dump ${RECOLLDOC}/rcl.install.config.html >> INSTALL
129
links -dump ${RECOLLDOC}/RCL.INSTALL.CONFIG.html >> INSTALL
130
130
131
$VCCMD commit -m "release $version" README INSTALL
131
$VCCMD commit -m "release $version" README INSTALL
132
132
133
# Clean up this dir and copy the dist-specific files 
133
# Clean up this dir and copy the dist-specific files 
134
make distclean
134
make distclean
...
...
141
$TAR chfX - excludefile .  | (cd $topdir;$TAR xf -)
141
$TAR chfX - excludefile .  | (cd $topdir;$TAR xf -)
142
if test $snap = "yes" ; then
142
if test $snap = "yes" ; then
143
    echo $version > $topdir/VERSION
143
    echo $version > $topdir/VERSION
144
fi
144
fi
145
145
146
# Fix the single/multiple page link in the header (we dont deliver the
147
# multi-page version and the file name is wrong anyway
148
sed -e '/\.\/index\.html/d' -e '/\.\/book\.html/d' \
149
    < $topdir/doc/user/usermanual.html > $topdir/doc/user/u1.html
150
diff $topdir/doc/user/u1.html $topdir/doc/user/usermanual.html
151
mv -f $topdir/doc/user/u1.html $topdir/doc/user/usermanual.html
152
153
# Can't now put ./Makefile in excludefile, gets ignored everywhere. So delete
146
# Can't now put ./Makefile in excludefile, gets ignored everywhere. So delete
154
# the top Makefile here (its' output by configure on the target system):
147
# the top Makefile here (its' output by configure on the target system):
155
rm -f $topdir/Makefile
148
rm -f $topdir/Makefile
156
149
157
out=$releasename.tar.gz
150
out=$releasename.tar.gz
...
...
159
    $TAR chf - $releasename | \
152
    $TAR chf - $releasename | \
160
        gzip > $out)
153
        gzip > $out)
161
echo "$targetdir/$out created"
154
echo "$targetdir/$out created"
162
155
163
# Check manifest against current reference
156
# Check manifest against current reference
157
(
158
export LANG=C
164
tar tzf $targetdir/$out | sort | cut -d / -f 2- | \
159
tar tzf $targetdir/$out | sort | cut -d / -f 2- | \
165
    diff mk/manifest.txt - || fatal "Please fix file list mk/manifest.txt"
160
    diff mk/manifest.txt - || fatal "Please fix file list mk/manifest.txt"
161
)
166
162
167
# We tag .. as there is the 'packaging/' directory in there
163
# We tag .. as there is the 'packaging/' directory in there
168
[ $dotag = "yes" ] && tagtop $TAG
164
[ $dotag = "yes" ] && tagtop $TAG