svn commit: samba r24821 - in branches/SAMBA_4_0_RELEASE/source/script: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-08-31 02:35:16 +0000 (Fri, 31 Aug 2007)
New Revision: 24821

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24821

Log:
Update the mkrelease.sh script and mkversion.sh to make releasing correct
Samba4 tarballs harder to screw up.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh
   branches/SAMBA_4_0_RELEASE/source/script/mkversion.sh


Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh	2007-08-31 01:53:13 UTC (rev 24820)
+++ branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh	2007-08-31 02:35:16 UTC (rev 24821)
@@ -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"
+
+
+

Modified: branches/SAMBA_4_0_RELEASE/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/script/mkversion.sh	2007-08-31 01:53:13 UTC (rev 24820)
+++ branches/SAMBA_4_0_RELEASE/source/script/mkversion.sh	2007-08-31 02:35:16 UTC (rev 24821)
@@ -174,6 +174,10 @@
     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
 ##