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

Subject: [Boost-commit] svn:boost r68484 - trunk/tools/release
From: bdawes_at_[hidden]
Date: 2011-01-27 14:34:29

Author: bemandawes
Date: 2011-01-27 14:34:28 EST (Thu, 27 Jan 2011)
New Revision: 68484
URL: http://svn.boost.org/trac/boost/changeset/68484

Log:
Export a specific revision number, protecting against divergence between POSIX and Windows packages.
Added:
   trunk/tools/release/revision_number.bat   (contents, props changed)
Text files modified: 
   trunk/tools/release/snapshot.bat         |     3 +++                                     
   trunk/tools/release/snapshot_posix.bat   |     9 ++-------                               
   trunk/tools/release/snapshot_windows.bat |     8 ++------                                
   3 files changed, 7 insertions(+), 13 deletions(-)

Added: trunk/tools/release/revision_number.bat
==============================================================================
--- (empty file)
+++ trunk/tools/release/revision_number.bat	2011-01-27 14:34:28 EST (Thu, 27 Jan 2011)
@@ -0,0 +1,13 @@
+rem  Create revision information, to be used by other script
+
+rem  Copyright 2011 Beman Dawes
+
+rem  Distributed under the Boost Software License, Version 1.0.
+rem  See http://www.boost.org/LICENSE_1_0.txt
+
+echo Getting current subversion revision number...
+svn co --non-interactive --depth=files http://svn.boost.org/svn/boost/branches/release svn_info
+svn info svn_info
+
+svn info svn_info | grep Revision | sed "s/Revision: /set BOOST_REVISION_NUMBER=/" >generated_set_release.bat
+call generated_set_release.bat

Modified: trunk/tools/release/snapshot.bat
==============================================================================
--- trunk/tools/release/snapshot.bat	(original)
+++ trunk/tools/release/snapshot.bat	2011-01-27 14:34:28 EST (Thu, 27 Jan 2011)
@@ -16,6 +16,8 @@
 echo Running svn update on %BOOST_TRUNK%
 svn --non-interactive --trust-server-cert up
 popd
+call %BOOST_TRUNK%\tools\release\revision_number.bat
+time /t
 call %BOOST_TRUNK%\tools\release\snapshot_download_docs.bat
 time /t
 call %BOOST_TRUNK%\tools\release\snapshot_posix.bat
@@ -24,3 +26,4 @@
 time /t
 call %BOOST_TRUNK%\tools\release\snapshot_inspection.bat
 time /t
+echo Revision %BOOST_REVISION_NUMBER% snapshot complete

Modified: trunk/tools/release/snapshot_posix.bat
==============================================================================
--- trunk/tools/release/snapshot_posix.bat	(original)
+++ trunk/tools/release/snapshot_posix.bat	2011-01-27 14:34:28 EST (Thu, 27 Jan 2011)
@@ -6,20 +6,15 @@
 rem  See http://www.boost.org/LICENSE_1_0.txt
 
 echo Build a branches/release snapshot for POSIX, using LF line termination...
-
+echo Revision %BOOST_REVISION_NUMBER%
 echo Removing old files...
 rmdir /s /q posix >nul
 rmdir /s /q svn_info >nul
 del posix.tar.gz >nul
 del posix.tar.bz2 >nul
 
-rem  leave an audit trail, which is used by inspect to determine revision number
-echo Getting current subversion revision number...
-svn co --non-interactive --depth=files http://svn.boost.org/svn/boost/branches/release svn_info
-svn info svn_info
-
 echo Exporting files from subversion...
-svn export --non-interactive --native-eol LF http://svn.boost.org/svn/boost/branches/release posix
+svn export --non-interactive --native-eol LF -r %BOOST_REVISION_NUMBER% http://svn.boost.org/svn/boost/branches/release posix
 
 echo Copying docs into posix\doc...
 pushd posix\doc

Modified: trunk/tools/release/snapshot_windows.bat
==============================================================================
--- trunk/tools/release/snapshot_windows.bat	(original)
+++ trunk/tools/release/snapshot_windows.bat	2011-01-27 14:34:28 EST (Thu, 27 Jan 2011)
@@ -6,6 +6,7 @@
 rem  See http://www.boost.org/LICENSE_1_0.txt
 
 echo Build a branches/release snapshot for Windows, using CRLF line termination...
+echo Revision %BOOST_REVISION_NUMBER%
 
 echo Removing old files...
 rmdir /s /q windows >nul
@@ -13,13 +14,8 @@
 del windows.7z >nul
 del windows.zip >nul
 
-rem  leave an audit trail, which is used by inspect to determine revision number
-echo Getting current subversion revision number...
-svn co --non-interactive --depth=files http://svn.boost.org/svn/boost/branches/release svn_info
-svn info svn_info
-
 echo Exporting files from subversion...
-svn export --non-interactive --native-eol CRLF http://svn.boost.org/svn/boost/branches/release windows
+svn export --non-interactive --native-eol CRLF -r %BOOST_REVISION_NUMBER% http://svn.boost.org/svn/boost/branches/release windows
 
 echo Copying docs into windows\doc...
 pushd windows\doc