[Boost-commit] svn:boost r68071 - branches/release/tools/release

Subject: [Boost-commit] svn:boost r68071 - branches/release/tools/release
From: bdawes_at_[hidden]
Date: 2011-01-12 17:14:13

Author: bemandawes
Date: 2011-01-12 17:14:11 EST (Wed, 12 Jan 2011)
New Revision: 68071
URL: http://svn.boost.org/trac/boost/changeset/68071

Log:
Merge from trunk
Added:
   branches/release/tools/release/merge2release.bat
      - copied unchanged from r68070, /trunk/tools/release/merge2release.bat
Properties modified: 
   branches/release/tools/release/   (props changed)
Text files modified: 
   branches/release/tools/release/inspect_trunk.bat       |     6 ++++--                                  
   branches/release/tools/release/snapshot_inspection.bat |    10 ++++------                              
   branches/release/tools/release/snapshot_posix.bat      |    10 +++++-----                              
   branches/release/tools/release/snapshot_windows.bat    |    10 +++++-----                              
   branches/release/tools/release/unmerged.bat            |     6 +++---                                  
   5 files changed, 21 insertions(+), 21 deletions(-)

Modified: branches/release/tools/release/inspect_trunk.bat
==============================================================================
--- branches/release/tools/release/inspect_trunk.bat	(original)
+++ branches/release/tools/release/inspect_trunk.bat	2011-01-12 17:14:11 EST (Wed, 12 Jan 2011)
@@ -10,13 +10,15 @@
 rem cleanup clears locks or other residual problems (we learned this the hard way!)
 svn cleanup
 echo Update trunk working copy...
-svn up --non-interactive
+svn up --non-interactive --trust-server-cert
 pushd tools\inspect\build
 echo Build inspect program...
 bjam
 popd
+echo Copy inspect.exe to %UTIL% directory...
+copy /y dist\bin\inspect.exe %UTIL%
 echo Inspect...
-dist\bin\inspect >%TEMP%\trunk_inspect.html
+inspect >%TEMP%\trunk_inspect.html
 
 echo Create ftp script...
 pushd %TEMP%

Modified: branches/release/tools/release/snapshot_inspection.bat
==============================================================================
--- branches/release/tools/release/snapshot_inspection.bat	(original)
+++ branches/release/tools/release/snapshot_inspection.bat	2011-01-12 17:14:11 EST (Wed, 12 Jan 2011)
@@ -1,16 +1,14 @@
 rem Inspect snapshot
 
-rem Copyright 2008 Beman Dawes
+rem Copyright Beman Dawes 2008, 2011
 
 rem Distributed under the Boost Software License, Version 1.0.
 rem See http://www.boost.org/LICENSE_1_0.txt
 
-pushd posix\tools\inspect\build
-bjam
-popd
 echo inspect...
-pushd posix
-dist\bin\inspect >..\inspect.html
+pushd windows
+rem inspect_trunk.bat builds inspect program every day and copies it to %UTIL%
+%UTIL%%\inspect >..\inspect.html
 popd
 
 echo Create ftp script...

Modified: branches/release/tools/release/snapshot_posix.bat
==============================================================================
--- branches/release/tools/release/snapshot_posix.bat	(original)
+++ branches/release/tools/release/snapshot_posix.bat	2011-01-12 17:14:11 EST (Wed, 12 Jan 2011)
@@ -13,13 +13,13 @@
 del posix.tar.gz >nul
 del posix.tar.bz2 >nul
 
-echo Exporting files from subversion...
 rem  leave an audit trail, which is used by inspect to determine revision number
-svn co --depth=files 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 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 Creating release history README.txt...
-lynx -width=72 -dump -nolist -display_charset=utf-8 http://beta.boost.org/users/history/minimal.php >posix\README.txt
+echo Exporting files from subversion...
+svn export --non-interactive --native-eol LF http://svn.boost.org/svn/boost/branches/release posix
 
 echo Copying docs into posix\doc...
 pushd posix\doc

Modified: branches/release/tools/release/snapshot_windows.bat
==============================================================================
--- branches/release/tools/release/snapshot_windows.bat	(original)
+++ branches/release/tools/release/snapshot_windows.bat	2011-01-12 17:14:11 EST (Wed, 12 Jan 2011)
@@ -13,13 +13,13 @@
 del windows.7z >nul
 del windows.zip >nul
 
-echo Exporting files from subversion...
 rem  leave an audit trail, which is used by inspect to determine revision number
-svn co --depth=files http://svn.boost.org/svn/boost/branches/release svn_info
-svn export --non-interactive --native-eol CRLF http://svn.boost.org/svn/boost/branches/release windows
+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 Creating release history README.txt...
-lynx -width=72 -dump -nolist -display_charset=utf-8 http://beta.boost.org/users/history/minimal.php >windows\README.txt
+echo Exporting files from subversion...
+svn export --non-interactive --native-eol CRLF http://svn.boost.org/svn/boost/branches/release windows
 
 echo Copying docs into windows\doc...
 pushd windows\doc

Modified: branches/release/tools/release/unmerged.bat
==============================================================================
--- branches/release/tools/release/unmerged.bat	(original)
+++ branches/release/tools/release/unmerged.bat	2011-01-12 17:14:11 EST (Wed, 12 Jan 2011)
@@ -6,10 +6,10 @@
 
 :usage_ok
 svn diff %2 %3 %4 %5 %6 http://svn.boost.org/svn/boost/branches/release/boost/%1.hpp ^
- http://svn.boost.org/svn/boost/trunk/boost/%1.hpp
+  https://svn.boost.org/svn/boost/trunk/boost/%1.hpp
 svn diff %2 %3 %4 %5 %6 http://svn.boost.org/svn/boost/branches/release/boost/%1 ^
-  http://svn.boost.org/svn/boost/trunk/boost/%1
+  https://svn.boost.org/svn/boost/trunk/boost/%1
 svn diff %2 %3 %4 %5 %6 http://svn.boost.org/svn/boost/branches/release/libs/%1 ^
-  http://svn.boost.org/svn/boost/trunk/libs/%1
+  https://svn.boost.org/svn/boost/trunk/libs/%1
 
 :done