Proper buildship.

diff --git a/.cvsignore b/.cvsignore
index 53d861565570bfd546fd73fc375383d5bbae5bf0..6a8f000414a69536ea48bd4814e8be21b3cdaf4a 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -24,3 +24,4 @@ config.status
 
 vd
 slash-etc
+shipcheck

diff --git a/Makefile.in b/Makefile.in
index 115ab4ab78256a6c7080b226c750d5e4e41da381..2a85e6106bb5f49a2cd20673f823ba09e1430a3a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ SOURCES=      Makefile.in configure.in acconfig.h                     \
 ALSOSHIP=      system.default system.override \
                spec.sgml overview.fig overview.ps \
                COPYING buildship install-sh .cvsignore
-GENSHIP=       lexer.l lexer.c tokens.h pcsum.h \
+GENSHIP=       lexer.l lexer.c tokens.h pcsum.h configure config.h.in \
                spec.html spec.ps overview.ps
 
 SHIPTARGETS=   $(SOURCES) $(ALSOSHIP) $(GENSHIP)
@@ -102,10 +102,11 @@ realclean:        distclean
 shipprep:      $(SHIPTARGETS)
 
 ship:          $(SHIPTARGETS)
-               rm -rf d && mkdir d && cp -av $^ d
-               mv d userv-$(VERSION)
-               GZIP=-9v tar zvvcf ../userv-$(VERSION).tar.gz userv-$(VERSION)
-               rm -rf userv-$(VERSION)
+               rm -rf shipcheck
+               mkdir shipcheck/userv-$(VERSION)
+               cp -av $^ shipcheck/userv-$(VERSION)
+               GZIP=-9v tar zvvcCf shipcheck userv-$(VERSION).tar.gz userv-$(VERSION)
+               rm -rf shipcheck/userv-$(VERSION)
 
 linecount:     $(SOURCES)
                wc -l $^

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