Get ready for 1.37.0; build docs only in the posix tree, then copy to windows tree.

[SVN r49399]

4 files changed, 78 insertions, 22 deletions

diff --git a/tools/release/inspect.sh b/tools/release/inspect.sh
index 04cc888c44..7c04fb58c2 100755
--- a/tools/release/inspect.sh
+++ b/tools/release/inspect.sh
@@ -1,9 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Inspect snapshot
 
 # © Copyright 2008 Beman Dawes
-# Distributed under the Boost Software License, Version 1.0. See http://www.boost.org/LICENSE_1_0.txt
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+
+# This script uses ftp, and thus assumes ~/.netrc contains a machine ... entry
 
 pushd posix/tools/inspect/build
 bjam
@@ -14,6 +17,7 @@ dist/bin/inspect >../inspect.html
 popd
 
 # create the ftp script
+echo create ftp script...
 echo "dir" >inspect.ftp
 echo "binary" >>inspect.ftp
 echo "put inspect.html" >>inspect.ftp
@@ -22,4 +26,6 @@ echo "rename inspect.html inspect-snapshot.html" >>inspect.ftp
 echo "dir" >>inspect.ftp
 echo "bye" >>inspect.ftp
 # use cygwin ftp rather than Windows ftp
+echo ftp...
 /usr/bin/ftp -v -i boost.cowic.de <inspect.ftp
+echo inspect.sh complete
diff --git a/tools/release/snapshot.sh b/tools/release/snapshot.sh
new file mode 100755
index 0000000000..dbc4dda786
--- /dev/null
+++ b/tools/release/snapshot.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# © Copyright 2008 Beman Dawes
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+
+./snapshot_posix.sh
+./snapshot_windows.sh
+./inspect.sh
diff --git a/tools/release/snapshot_posix.sh b/tools/release/snapshot_posix.sh
index 70546abbb3..9fc5eb4757 100755
--- a/tools/release/snapshot_posix.sh
+++ b/tools/release/snapshot_posix.sh
@@ -1,34 +1,55 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Build a branches/release snapshot for Posix, using LF line termination
 
-# © Copyright 2008 Beman Dawes
-# Distributed under the Boost Software License, Version 1.0. See http://www.boost.org/LICENSE_1_0.txt
+# © Copyright 2008 Beman Dawes
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
 
+echo "Build a branches/release snapshot for POSIX, using LF line termination..."
+
+echo "Removing old files..."
 rm -r -f posix
+
+echo "Exporting files from subversion..."
 svn export --non-interactive --native-eol LF http://svn.boost.org/svn/boost/branches/release posix
+
+echo "Building docs..."
 pushd posix/doc
-bjam --v2 >../../posix-bjam.log
+bjam-cygwin --v2 --toolset=gcc &>../../posix-bjam.log
 popd
+
+echo "Cleaning up and renaming..."
 rm -r posix/bin.v2
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 mv posix boost-posix-$SNAPSHOT_DATE
 rm -f posix.tar.gz
 rm -f posix.tar.bz2
+
+echo "Building .gz file..."
 tar cfz posix.tar.gz boost-posix-$SNAPSHOT_DATE
+echo "Building .bz2 file..."
 gunzip -c posix.tar.gz | bzip2 >posix.tar.bz2
 mv boost-posix-$SNAPSHOT_DATE posix
-# create the ftp script
+
+echo "Creating ftp script..."
 echo "dir" >posix.ftp
 echo "binary" >>posix.ftp
-echo "put posix.tar.gz" >>posix.ftp
-echo "mdelete boost-posix*.gz" >>posix.ftp
-echo "rename posix.tar.gz boost-posix-$SNAPSHOT_DATE.tar.gz" >>posix.ftp
+
+#echo "put posix.tar.gz" >>posix.ftp
+#echo "mdelete boost-posix*.gz" >>posix.ftp
+#echo "rename posix.tar.gz boost-posix-$SNAPSHOT_DATE.tar.gz" >>posix.ftp
+
 echo "put posix.tar.bz2" >>posix.ftp
 echo "mdelete boost-posix*.bz2" >>posix.ftp
 echo "rename posix.tar.bz2 boost-posix-$SNAPSHOT_DATE.tar.bz2" >>posix.ftp
+
 echo "dir" >>posix.ftp
 echo "bye" >>posix.ftp
+
+echo "Running ftp script..."
 # use cygwin ftp rather than Windows ftp
 /usr/bin/ftp -v -i boost.cowic.de <posix.ftp
+
+echo "POSIX snapshot complete!
diff --git a/tools/release/snapshot_windows.sh b/tools/release/snapshot_windows.sh
index d3b18f1306..b4b1938528 100755
--- a/tools/release/snapshot_windows.sh
+++ b/tools/release/snapshot_windows.sh
@@ -1,41 +1,61 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Build a branches/release snapshot for Windows, using CRLF line termination
 
 # © Copyright 2008 Beman Dawes
-# Distributed under the Boost Software License, Version 1.0. See http://www.boost.org/LICENSE_1_0.txt
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
 
+# This script uses ftp, and thus assumes ~/.netrc contains a machine ... entry
+
+echo "Build a branches/release snapshot for Windows, using CRLF line termination..."
+
+echo "Removing old files..."
 rm -r -f windows
+
+echo "Exporting files from subversion..."
 svn export --non-interactive --native-eol CRLF http://svn.boost.org/svn/boost/branches/release windows
-pushd windows/doc
-bjam --v2 >../../windows-bjam.log
-popd
+
+#echo "Building documentation..."
+#pushd windows/doc
+#bjam-cygwin --v2 --toolset=gcc &>../../windows-bjam.log
+#popd
+
+echo "Copying docs from posix tree..."
+cp --recursive posix/doc/html windows/doc
+
+echo "Cleaning up and renaming..."
 rm -r windows/bin.v2
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 mv windows boost-windows-$SNAPSHOT_DATE
 
-rm -f windows.zip
-zip -r windows.zip boost-windows-$SNAPSHOT_DATE
+#rm -f windows.zip
+#zip -r windows.zip boost-windows-$SNAPSHOT_DATE
 
+echo "Building .7z..."
 rm -f windows.7z
 7z a -r windows.7z boost-windows-$SNAPSHOT_DATE
 
+echo "Reverting name..."
 mv boost-windows-$SNAPSHOT_DATE windows
 
-# create the ftp script
+echo "Creating ftp script..."
 echo "dir" >windows.ftp
 echo "binary" >>windows.ftp
 
-echo "put windows.zip" >>windows.ftp
-echo "mdelete boost-windows*.zip" >>windows.ftp
-echo "rename windows.zip boost-windows-$SNAPSHOT_DATE.zip" >>windows.ftp
+#echo "put windows.zip" >>windows.ftp
+#echo "mdelete boost-windows*.zip" >>windows.ftp
+#echo "rename windows.zip boost-windows-$SNAPSHOT_DATE.zip" >>windows.ftp
 
 echo "put windows.7z" >>windows.ftp
 echo "mdelete boost-windows*.7z" >>windows.ftp
 echo "rename windows.7z boost-windows-$SNAPSHOT_DATE.7z" >>windows.ftp
-
 echo "dir" >>windows.ftp
 echo "bye" >>windows.ftp
+
+echo "Running ftp script..."
 # use cygwin ftp rather than windows ftp
 /usr/bin/ftp -v -i boost.cowic.de <windows.ftp
+
+echo "Windows snapshot complete!