Allow s_release to work from a git or hg tree.

1 files changed, 16 insertions, 7 deletions

diff --git a/dist/s_release b/dist/s_release
index 8682fe09d3d..8429795a08c 100755
--- a/dist/s_release
+++ b/dist/s_release
@@ -2,10 +2,12 @@
 # Build a WiredTiger release package.
 
 set -e
-RELEASE_DIR=../releases
 
 . ./RELEASE || exit 1
 
+RELEASE_DIR=`pwd`/../releases
+mkdir -p $RELEASE_DIR
+
 pkgver="$1"
 if test -z "$pkgver" ; then
 	pkgver="$WIREDTIGER_VERSION"
@@ -13,12 +15,19 @@ fi
 PKG="wiredtiger-$pkgver"
 DEST="$RELEASE_DIR/$PKG"
 
-rm -rf "$DEST"
-
-echo "Running 'hg archive' to copy the tree"
-hg archive \
-    `sed -e '/^#/d' -e 's/^/--exclude ..\//' < s_release.list` \
-    "$DEST"
+rm -rf $DEST ; mkdir -p $DEST
+EXCLUSIONS=`sed -e '/^#/d' -e 's/^/--exclude /' < s_release.list`
+
+if [ -d ../.hg ] ; then
+	echo "Running 'hg archive' to copy the tree"
+	(cd .. && hg archive $EXCLUSIONS $DEST)
+elif [ -d ../.git ] ; then
+	echo "Running 'git archive' to copy the tree"
+	(cd .. && git archive HEAD) | (cd $DEST && tar xf - $EXCLUSIONS)
+else
+	echo "$0 must be run in a Git or Mercurial tree"
+	exit 1
+fi
 
 echo "Running 'dist/s_all' in the release tree"
 (cd "$DEST/dist" && env WT_RELEASE_BUILD=yes sh s_all -A > /dev/null)