chiark
/
gitweb
/
~ian
/
userv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37911e2
)
Bugfix.
author
ian
<ian>
Sun, 24 Aug 1997 23:23:38 +0000
(23:23 +0000)
committer
ian
<ian>
Sun, 24 Aug 1997 23:23:38 +0000
(23:23 +0000)
Makefile.in
patch
|
blob
|
history
buildship
patch
|
blob
|
history
diff --git
a/Makefile.in
b/Makefile.in
index 51973746df5c1ea4f3fac3f79fc976433ecad078..315583b60f8cde0c462a1dfbd6b053a0867f149d 100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-104,8
+104,9
@@
shipprep: $(SHIPTARGETS)
ship: $(SHIPTARGETS)
rm -rf shipcheck
mkdir -p shipcheck/userv-$(VERSION)
ship: $(SHIPTARGETS)
rm -rf shipcheck
mkdir -p shipcheck/userv-$(VERSION)
- cp -av $^ shipcheck/userv-$(VERSION)
- GZIP=-9v tar zvvcCf shipcheck userv-$(VERSION).tar.gz userv-$(VERSION)
+ cp -a $^ shipcheck/userv-$(VERSION)
+ cd shipcheck && \
+ GZIP=-9v tar zvvcf userv-$(VERSION).tar.gz userv-$(VERSION)
rm -rf shipcheck/userv-$(VERSION)
linecount: $(SOURCES)
rm -rf shipcheck/userv-$(VERSION)
linecount: $(SOURCES)
diff --git
a/buildship
b/buildship
index bd7876dcd473bfa8fe68060ff0edec4582eb33ca..f01b03e43233779586c0d5dd92b0148ae4e64df8 100755
(executable)
--- a/
buildship
+++ b/
buildship
@@
-11,10
+11,10
@@
version=$1
targz=userv-$version.tar.gz
tag=`echo release-$version | sed -e 's/\./-/g'`
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
cvs tag -F -c $tag
-echo >&2 'Generating pre-built files ...'
+echo >&2 '
***
Generating pre-built files ...'
autoconf
autoheader
./configure
autoconf
autoheader
./configure
@@
-22,11
+22,12
@@
make ship VERSION=$version
cd shipcheck
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
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:
if test "x`cvs -n update`" != x
then
echo >&2 mismatch:
@@
-36,12
+37,12
@@
fi
cd ..
rm -rf userv
cd ..
rm -rf userv
-echo >&2 'Doing test build ...'
+echo >&2 '
***
Doing test build ...'
cd userv-$version
./configure
make
cd ../..
cd userv-$version
./configure
make
cd ../..
-echo >&2 "OK. Distribution file is ../$targz."
+echo >&2 "
***
OK. Distribution file is ../$targz."
mv -f shipcheck/$targz ..
mv -f shipcheck/$targz ..