[Boost-commit] svn:boost r74866 - trunk/tools/release

Subject: [Boost-commit] svn:boost r74866 - trunk/tools/release
From: frederic.bron_at_[hidden]
Date: 2011-10-09 18:33:25

Author: bronf
Date: 2011-10-09 18:33:24 EDT (Sun, 09 Oct 2011)
New Revision: 74866
URL: http://svn.boost.org/trac/boost/changeset/74866

Log:
added POSIX version of merge2release -> merge2release.bash
Added:
   trunk/tools/release/merge2release.bash   (contents, props changed)

Added: trunk/tools/release/merge2release.bash
==============================================================================
--- (empty file)
+++ trunk/tools/release/merge2release.bash	2011-10-09 18:33:24 EDT (Sun, 09 Oct 2011)
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Copyright Frederic Bron 2011
+# Distributed under the Boost Software License, Version 1.0.  See http://www.boost.org/LICENSE_1_0.txt
+
+set -x
+
+function merge() {
+	item=$1; shift
+	LC_ALL=C svn merge "$@"\
+		https://svn.boost.org/svn/boost/branches/release/$item\
+		https://svn.boost.org/svn/boost/trunk/$item
+}
+
+if [ $# -lt 1 ]; then
+	echo "Usage: merge2release.bash library-name [svn-options]"
+	echo "Options include --dry-run"
+	exit
+fi
+if [ -z "$BOOST_RELEASE" ]; then
+	echo "environment variable BOOST_RELEASE should point to the boost/branches/release directory"
+	exit
+fi
+
+lib=$1
+shift
+
+cd $BOOST_RELEASE
+path=`pwd`
+cd $path/boost
+merge boost/$lib.hpp "$@"
+cd $path/boost/$lib
+merge boost/$lib "$@"
+cd $path/libs/$lib
+merge libs/$lib "$@"