Don't use TMPDIR as variable, it's already used for other purposes.

[metze/samba/wip.git] / source4 / script / mkrelease.sh

diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
index 0af738deb52e3a647c4ad634f99e339ef42c8511..303dfe6d953e9e568976e90136024d494972ffe2 100755 (executable)
--- a/source4/script/mkrelease.sh
+++ b/source4/script/mkrelease.sh
@@ -1,22 +1,35 @@
 #!/bin/sh
 
-if [ ! -d ".git" -o `dirname $0` != "./source/script" ]; then
+if [ ! -d ".git" -o `dirname $0` != "./source4/script" ]; then
        echo "Run this script from the top-level directory in the"
-       echo "repository as: ./source/script/mkrelease.sh"
+       echo "repository as: ./source4/script/mkrelease.sh"
        exit 1
 fi
 
-TMPDIR=`mktemp -d samba-XXXXX`
-(git archive --format=tar HEAD | (cd $TMPDIR/ && tar xf -))
+OUTDIR=`mktemp -d samba-XXXXX`
+(git archive --format=tar HEAD | (cd $OUTDIR/ && tar xf -))
 
-( cd $TMPDIR/source || exit 1
+echo SAMBA_VERSION_IS_GIT_SNAPSHOT=no >> $OUTDIR/source4/VERSION
+
+#Prepare the tarball for a Samba4 release, with some generated files,
+#but without Samba3 stuff (to avoid confusion)
+( cd $OUTDIR/ || exit 1
+ rm -rf README Manifest Read-Manifest-Now Roadmap source3 packaging docs-xml examples swat WHATSNEW.txt MAINTAINERS || exit 1
+ cd source4 || exit 1
  ./autogen.sh || exit 1
  ./configure || exit 1
  make dist  || exit 1
 ) || exit 1
 
-VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $TMPDIR/source/version.h`
-mv $TMPDIR samba-$VERSION || exit 1
+VERSION_FILE=$OUTDIR/source4/version.h
+if [ ! -f $VERSION_FILE ]; then
+    echo "Cannot find version.h at $VERSION_FILE"
+    exit 1;
+fi
+
+VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $VERSION_FILE`
+echo "Version: $VERSION"
+mv $OUTDIR samba-$VERSION || exit 1
 tar -cf samba-$VERSION.tar samba-$VERSION || (rm -rf samba-$VERSION; exit 1)
 rm -rf samba-$VERSION || exit 1
 echo "Now run: "