diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-08-31 02:44:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:16 -0500 |
| commit | 6f9ea168a65916dd74f10ddfcec3b6a79f610492 (patch) | |
| tree | 9a041592b2c5932b82716e8ea0d3bead28bce093 | |
| parent | b7eae7879411bbd4b62f6b93991cffe3c99ac5cd (diff) | |
| download | samba-6f9ea168a65916dd74f10ddfcec3b6a79f610492.tar.gz samba-6f9ea168a65916dd74f10ddfcec3b6a79f610492.tar.bz2 samba-6f9ea168a65916dd74f10ddfcec3b6a79f610492.zip | |
r24822: Merge from SAMBA_4_0_RELEASE:
Update the mkrelease.sh script and mkversion.sh to make releasing correct
Samba4 tarballs harder to screw up.
Andrew Bartlett
(This used to be commit 5f9ca54b5cc76cedcb56d805d5f9ea9167adc94b)
| -rwxr-xr-x | source4/script/mkrelease.sh | 23 | ||||
| -rwxr-xr-x | source4/script/mkversion.sh | 4 |
2 files changed, 22 insertions, 5 deletions
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index 8e2ac0fcb9..a6e7c8493b 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -1,11 +1,24 @@ #!/bin/sh -VERSION=$1 +TMPDIR=`mktemp samba-XXXXX` +rm $TMPDIR || exit 1 +svn export . $TMPDIR || exit 1 -svn export . samba-$VERSION || exit 1 - -( cd samba-$VERSION/source +( cd $TMPDIR/source ./autogen.sh || exit 1 ./configure || exit 1 make dist || exit 1 -) && tar -zcf samba-$VERSION.tar.gz samba-$VERSION +) || exit 1 + +VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $TMPDIR/source/version.h` +mv $TMPDIR samba-$VERSION || exit 1 +tar -cf samba-$VERSION.tar samba-$VERSION || exit 1 +echo "Now run: " +echo "gpg --detach-sign --armor samba-$VERSION.tar" +echo "gzip samba-$VERSION.tar" +echo "And then upload " +echo "samba-$VERSION.tar.gz samba-$VERSION.tar.asc" +echo "to pub/samba/samba4/ on samba.org" + + + diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh index d29e8bcb94..91c7894cdb 100755 --- a/source4/script/mkversion.sh +++ b/source4/script/mkversion.sh @@ -174,6 +174,10 @@ if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then fi fi +echo "/* Version for mkrelease.sh: " >> $OUTPUT_FILE +echo "SAMBA_VERSION_STRING=$SAMBA_VERSION_STRING" >> $OUTPUT_FILE +echo "*/" >> $OUTPUT_FILE + ## ## Add a release nickname ## |