[Boost-commit] svn:boost r56782 - in branches/release/tools/release: . msvc release-mgt-msvc release-mgt-msvc/compare_trees release-mgt-msvc/strftime

Subject: [Boost-commit] svn:boost r56782 - in branches/release/tools/release: . msvc release-mgt-msvc release-mgt-msvc/compare_trees release-mgt-msvc/strftime
From: bdawes_at_[hidden]
Date: 2009-10-13 10:53:56

Author: bemandawes
Date: 2009-10-13 10:53:55 EDT (Tue, 13 Oct 2009)
New Revision: 56782
URL: http://svn.boost.org/trac/boost/changeset/56782

Log:
tools/release: merge trunk
Added:
   branches/release/tools/release/build_release_packages.bat
      - copied unchanged from r56781, /trunk/tools/release/build_release_packages.bat
   branches/release/tools/release/inspect_trunk.bat
      - copied unchanged from r56781, /trunk/tools/release/inspect_trunk.bat
   branches/release/tools/release/linux_user-config.jam
      - copied unchanged from r56781, /trunk/tools/release/linux_user-config.jam
   branches/release/tools/release/release-mgt-msvc/
      - copied from r56781, /trunk/tools/release/release-mgt-msvc/
   branches/release/tools/release/release-mgt-msvc/compare_trees/
      - copied from r56781, /trunk/tools/release/release-mgt-msvc/compare_trees/
   branches/release/tools/release/release-mgt-msvc/compare_trees/compare_trees.vcproj
      - copied unchanged from r56781, /trunk/tools/release/release-mgt-msvc/compare_trees/compare_trees.vcproj
   branches/release/tools/release/release-mgt-msvc/msvc.sln
      - copied unchanged from r56781, /trunk/tools/release/release-mgt-msvc/msvc.sln
   branches/release/tools/release/release-mgt-msvc/strftime/
      - copied from r56781, /trunk/tools/release/release-mgt-msvc/strftime/
   branches/release/tools/release/release-mgt-msvc/strftime/strftime.vcproj
      - copied unchanged from r56781, /trunk/tools/release/release-mgt-msvc/strftime/strftime.vcproj
   branches/release/tools/release/release_reports.sh
      - copied unchanged from r56781, /trunk/tools/release/release_reports.sh
   branches/release/tools/release/snapshot.bat
      - copied unchanged from r56781, /trunk/tools/release/snapshot.bat
   branches/release/tools/release/snapshot_download_docs.bat
      - copied unchanged from r56781, /trunk/tools/release/snapshot_download_docs.bat
   branches/release/tools/release/snapshot_inspect.sh
      - copied unchanged from r56781, /trunk/tools/release/snapshot_inspect.sh
   branches/release/tools/release/snapshot_inspection.bat
      - copied unchanged from r56781, /trunk/tools/release/snapshot_inspection.bat
   branches/release/tools/release/snapshot_posix.bat
      - copied unchanged from r56781, /trunk/tools/release/snapshot_posix.bat
   branches/release/tools/release/snapshot_windows.bat
      - copied unchanged from r56781, /trunk/tools/release/snapshot_windows.bat
   branches/release/tools/release/strftime.cpp
      - copied unchanged from r56781, /trunk/tools/release/strftime.cpp
   branches/release/tools/release/unmerged.bat
      - copied unchanged from r56781, /trunk/tools/release/unmerged.bat
   branches/release/tools/release/unmerged_all.bat
      - copied unchanged from r56781, /trunk/tools/release/unmerged_all.bat
   branches/release/tools/release/upload2sourceforge.bat
      - copied unchanged from r56781, /trunk/tools/release/upload2sourceforge.bat
Removed:
   branches/release/tools/release/diff_trunk_release.bat
   branches/release/tools/release/msvc/
Properties modified: 
   branches/release/tools/release/   (props changed)
Text files modified: 
   branches/release/tools/release/build_release_packages.sh |     5 +++--                                   
   branches/release/tools/release/snapshot.sh               |    13 ++++++++++---                           
   branches/release/tools/release/snapshot_posix.sh         |    22 ++++++++++++++++------                  
   branches/release/tools/release/snapshot_windows.sh       |    23 ++++++++++-------------                 
   4 files changed, 39 insertions(+), 24 deletions(-)

Modified: branches/release/tools/release/build_release_packages.sh
==============================================================================
--- branches/release/tools/release/build_release_packages.sh	(original)
+++ branches/release/tools/release/build_release_packages.sh	2009-10-13 10:53:55 EDT (Tue, 13 Oct 2009)
@@ -3,7 +3,8 @@
 # Build release packages
 
 # 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
 
 if [ $# -lt 1 ]
 then
@@ -21,7 +22,7 @@
 echo "creating gz..."
 tar cfz $1.tar.gz $1
 echo "creating bz2..."
-gunzip -c $1.tar.gz | bzip2 >$1.tar.bz2
+gzip -c $1.tar.gz | bzip2 >$1.tar.bz2
 echo "cleaning up..."
 mv $1 posix
 

Deleted: branches/release/tools/release/diff_trunk_release.bat
==============================================================================
--- branches/release/tools/release/diff_trunk_release.bat	2009-10-13 10:53:55 EDT (Tue, 13 Oct 2009)
+++ (empty file)
@@ -1,10 +0,0 @@
-_at_echo off
-if not %1$==$ goto usage_ok
-echo Usage: diff_trunk_release library-name
-goto done
-
-:usage_ok
-svn diff http://svn.boost.org/svn/boost/branches/release/boost/%1 http://svn.boost.org/svn/boost/trunk/boost/%1
-svn diff http://svn.boost.org/svn/boost/branches/release/libs/%1 http://svn.boost.org/svn/boost/trunk/libs/%1
-
-:done

Modified: branches/release/tools/release/snapshot.sh
==============================================================================
--- branches/release/tools/release/snapshot.sh	(original)
+++ branches/release/tools/release/snapshot.sh	2009-10-13 10:53:55 EDT (Tue, 13 Oct 2009)
@@ -4,6 +4,13 @@
 # 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
+sleep 5s
+echo Using $BOOST_TRUNK as boost trunk
+date
+$BOOST_TRUNK/tools/release/snapshot_posix.sh
+date
+$BOOST_TRUNK/tools/release/snapshot_windows.sh
+date
+$BOOST_TRUNK/tools/release/snapshot_inspect.sh
+date
+sleep 5s

Modified: branches/release/tools/release/snapshot_posix.sh
==============================================================================
--- branches/release/tools/release/snapshot_posix.sh	(original)
+++ branches/release/tools/release/snapshot_posix.sh	2009-10-13 10:53:55 EDT (Tue, 13 Oct 2009)
@@ -10,17 +10,27 @@
 
 echo "Removing old files..."
 rm -r -f posix
+rm -r -f svn_info
 
 echo "Exporting files from subversion..."
+# leave an audit trail, which is used by inspect to determine revision number
+#   use --non-recursive rather than --depth=files until the linux distros catch up
+svn co --non-recursive http://svn.boost.org/svn/boost/branches/release svn_info
 svn export --non-interactive --native-eol LF http://svn.boost.org/svn/boost/branches/release posix
 
-echo "Building docs..."
-pushd posix/doc
-bjam-cygwin --v2 --toolset=gcc &>../../posix-bjam.log
-popd
+#echo "Building bjam..."
+# failure to use an up-to-date copy of bjam has caused much wasted effort.
+#pushd posix/tools/jam/src
+#./build.sh gcc
+#popd
+#
+#echo "Building docs..."
+#pushd posix/doc
+#../tools/jam/src/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log
+#popd
 
 echo "Cleaning up and renaming..."
-rm -r posix/bin.v2
+#rm -r posix/bin.v2
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 mv posix boost-posix-$SNAPSHOT_DATE
@@ -52,4 +62,4 @@
 # use cygwin ftp rather than Windows ftp
 /usr/bin/ftp -v -i boost.cowic.de <posix.ftp
 
-echo "POSIX snapshot complete!
+echo POSIX snapshot complete!

Modified: branches/release/tools/release/snapshot_windows.sh
==============================================================================
--- branches/release/tools/release/snapshot_windows.sh	(original)
+++ branches/release/tools/release/snapshot_windows.sh	2009-10-13 10:53:55 EDT (Tue, 13 Oct 2009)
@@ -16,16 +16,10 @@
 echo "Exporting files from subversion..."
 svn export --non-interactive --native-eol CRLF http://svn.boost.org/svn/boost/branches/release windows
 
-#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 "Copying docs from posix tree..."
-cp --recursive posix/doc/html windows/doc
-
-echo "Cleaning up and renaming..."
-rm -r windows/bin.v2
+echo "Renaming..."
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 mv windows boost-windows-$SNAPSHOT_DATE
@@ -35,13 +29,16 @@
 
 echo "Building .7z..."
 rm -f windows.7z
+# On Windows, 7z comes from the 7-Zip package, not Cygwin,
+# so path must include C:\Program Files\7-Zip.
 7z a -r windows.7z boost-windows-$SNAPSHOT_DATE
 
 echo "Reverting name..."
 mv boost-windows-$SNAPSHOT_DATE windows
 
 echo "Creating ftp script..."
-echo "dir" >windows.ftp
+cat <user.txt >>windows.ftp
+echo "dir" >>windows.ftp
 echo "binary" >>windows.ftp
 
 #echo "put windows.zip" >>windows.ftp
@@ -55,7 +52,7 @@
 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
+# This is the Windows ftp client
+ftp -n -i -d -s:windows.ftp boost.cowic.de
 
-echo "Windows snapshot complete!
+echo "Windows snapshot complete!"