From 7ddcb20d15babbacb2a52bde280fee7eb85d7e69 Mon Sep 17 00:00:00 2001 From: Andrew Kroeger Date: Fri, 28 Mar 2008 21:55:09 -0500 Subject: mkrelease: Update to work with Git instead of SVN. (This used to be commit 66efff41a72190ad73512cbf08fa68b1b44406b9) --- source4/script/mkrelease.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/script/mkrelease.sh') diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index a6e7c8493b..d74d5d133f 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -1,8 +1,7 @@ #!/bin/sh -TMPDIR=`mktemp samba-XXXXX` -rm $TMPDIR || exit 1 -svn export . $TMPDIR || exit 1 +TMPDIR=`mktemp -d samba-XXXXX` +(git archive --format=tar HEAD | (cd $TMPDIR/ ; tar xf -)) ( cd $TMPDIR/source ./autogen.sh || exit 1 -- cgit From 1d29ab25360f4b337a6d4ed41f8894a89047487b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 29 Mar 2008 14:23:43 +1100 Subject: Don't leave release trees hanging around Andrew Bartlett (This used to be commit e06911de3326fcbd751932d6ab1b9d4644619135) --- source4/script/mkrelease.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/script/mkrelease.sh') diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index d74d5d133f..bd3314441c 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -11,7 +11,8 @@ TMPDIR=`mktemp -d samba-XXXXX` 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 +tar -cf samba-$VERSION.tar samba-$VERSION || (rm -rf samba-$VERSION; exit 1) +rm -rf samba-$VERSION || exit 1 echo "Now run: " echo "gpg --detach-sign --armor samba-$VERSION.tar" echo "gzip samba-$VERSION.tar" -- cgit From bf0db7eb030a22f3f91ee86ffe5fb96bc7d7661e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 29 Mar 2008 14:37:09 +1100 Subject: Add a few more safety catches to the mkrelease.sh script. Andrew Bartlett (This used to be commit 96eb3f1691fbc8808e3cb80a45283fb7dff53826) --- source4/script/mkrelease.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/script/mkrelease.sh') diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index bd3314441c..e6b6c2af07 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -1,9 +1,9 @@ #!/bin/sh TMPDIR=`mktemp -d samba-XXXXX` -(git archive --format=tar HEAD | (cd $TMPDIR/ ; tar xf -)) +(git archive --format=tar HEAD | (cd $TMPDIR/ && tar xf -)) -( cd $TMPDIR/source +( cd $TMPDIR/source || exit 1 ./autogen.sh || exit 1 ./configure || exit 1 make dist || exit 1 -- cgit From 0ea02e8126d3984da53da2d8f1557556f7c7ff1e Mon Sep 17 00:00:00 2001 From: Andrew Kroeger Date: Fri, 28 Mar 2008 22:53:01 -0500 Subject: mkrelease: Add checks to ensure run from top-level directory of repository. (This used to be commit 7d4c02fdfc9ca1a48a0a1e4672765636d4c4a717) --- source4/script/mkrelease.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source4/script/mkrelease.sh') diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index e6b6c2af07..0af738deb5 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -1,5 +1,11 @@ #!/bin/sh +if [ ! -d ".git" -o `dirname $0` != "./source/script" ]; then + echo "Run this script from the top-level directory in the" + echo "repository as: ./source/script/mkrelease.sh" + exit 1 +fi + TMPDIR=`mktemp -d samba-XXXXX` (git archive --format=tar HEAD | (cd $TMPDIR/ && tar xf -)) -- cgit