X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=buildship;h=e2df0f676a3fd0eb1354ba1e6a26a6a3ea8baf0f;hp=bd7876dcd473bfa8fe68060ff0edec4582eb33ca;hb=dbad0a53f8c54ac65c5859d3e213a10821b797ff;hpb=6fa840b6d85a9d2bde633c1bd2a3021b5e2d21bf

diff --git a/buildship b/buildship
index bd7876d..e2df0f6 100755
--- a/buildship
+++ b/buildship
@@ -2,19 +2,14 @@
 # to release, check out a fresh copy and then run this
 
 set -e
-if test $# = 0
-then
-	echo >&2 'usage: buildship <version>'
-	exit 1
-fi
-version=$1
+version=`sed -n 's/^#define VERSION \".*\" *$/\1/'
 targz=userv-$version.tar.gz
 tag=`echo release-$version | sed -e 's/\./-/g'`
 
-echo >&2 "Tagging (version $version, tag $tag) ..."
+echo >&2 "*** Tagging (version $version, tag $tag) ..."
 cvs tag -F -c $tag
 
-echo >&2 'Generating pre-built files ...'
+echo >&2 '*** Generating pre-built files ...'
 autoconf
 autoheader
 ./configure
@@ -22,11 +17,12 @@ make ship VERSION=$version
 
 cd shipcheck
 
-echo >&2 'Checking whether identical to repository version ...'
+echo >&2 '*** Checking whether identical to repository version ...'
 tar zxf $targz
 cvs co -r $tag userv
-cp userv-$version/* userv/.
-cd userv
+cd userv-$version
+cp -r . ../userv/.
+cd ../userv
 if test "x`cvs -n update`" != x
 then
 	echo >&2 mismatch:
@@ -36,12 +32,12 @@ fi
 cd ..
 rm -rf userv
 
-echo >&2 'Doing test build ...'
+echo >&2 '*** Doing test build ...'
 cd userv-$version
 ./configure
 make
 
 cd ../..
 
-echo >&2 "OK.  Distribution file is ../$targz."
+echo >&2 "*** OK.  Distribution file is ../$targz."
 mv -f shipcheck/$targz ..