Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

Subject: [Boost-commit] svn:boost r74757 - branches/release/tools/release
From: bdawes_at_[hidden]
Date: 2011-10-06 11:29:45

Author: bemandawes
Date: 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
New Revision: 74757
URL: http://svn.boost.org/trac/boost/changeset/74757

Log:
Merge tools/release from trunk
Added:
   branches/release/tools/release/2release.bat
      - copied unchanged from r74756, /trunk/tools/release/2release.bat
   branches/release/tools/release/README
      - copied unchanged from r74756, /trunk/tools/release/README
   branches/release/tools/release/bjam_warnings.bat
      - copied unchanged from r74756, /trunk/tools/release/bjam_warnings.bat
   branches/release/tools/release/merge_release_cycle_init.bat
      - copied unchanged from r74756, /trunk/tools/release/merge_release_cycle_init.bat
   branches/release/tools/release/revision_number.bat
      - copied unchanged from r74756, /trunk/tools/release/revision_number.bat
   branches/release/tools/release/unmerged_whatever.bat
      - copied unchanged from r74756, /trunk/tools/release/unmerged_whatever.bat
Properties modified:
   branches/release/tools/release/ (props changed)
Text files modified:
   branches/release/tools/release/build_release_packages.bat | 1 +
   branches/release/tools/release/merge2release.bat | 17 ++++++++---------
   branches/release/tools/release/snapshot.bat | 13 +++++++++++++
   branches/release/tools/release/snapshot_download_docs.bat | 9 +++++----
   branches/release/tools/release/snapshot_posix.bat | 17 ++++++-----------
   branches/release/tools/release/snapshot_posix.sh | 4 ++--
   branches/release/tools/release/snapshot_windows.bat | 14 +++++---------
   branches/release/tools/release/unmerged.bat | 8 +++++---
   branches/release/tools/release/unmerged_all.bat | 2 ++
   branches/release/tools/release/upload2sourceforge.bat | 2 ++
   10 files changed, 49 insertions(+), 38 deletions(-)

Modified: branches/release/tools/release/build_release_packages.bat
==============================================================================
--- branches/release/tools/release/build_release_packages.bat (original)
+++ branches/release/tools/release/build_release_packages.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -41,6 +41,7 @@
 echo Cleaning up windows...
 ren %1 windows
 
+grep "Revision:" snapshot.log
 echo Build release packages complete
 
 :done

Modified: branches/release/tools/release/merge2release.bat
==============================================================================
--- branches/release/tools/release/merge2release.bat (original)
+++ branches/release/tools/release/merge2release.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -1,4 +1,6 @@
 rem @echo off
+rem Copyright Beman Dawes 2010
+rem Distributed under the Boost Software License, Version 1.0. See http://www.boost.org/LICENSE_1_0.txt
 if not %1$==$ goto usage_ok
 echo Usage: merge2release library-name [svn-options]
 echo Options include --dry-run
@@ -7,17 +9,14 @@
 :usage_ok
 pushd %BOOST_RELEASE%
 pushd boost
-svn merge %2 %3 %4 %5 %6 https://svn.boost.org/svn/boost/branches/release/boost/%1.hpp ^
- https://svn.boost.org/svn/boost/trunk/boost/%1.hpp
+call 2release boost/%1.hpp %2 %3 %4 %5 %6
 pushd %1
-svn merge %2 %3 %4 %5 %6 https://svn.boost.org/svn/boost/branches/release/boost/%1 ^
- https://svn.boost.org/svn/boost/trunk/boost/%1
+call 2release boost/%1 %2 %3 %4 %5 %6
+popd
+popd
+pushd libs\%1
+call 2release libs/%1 %2 %3 %4 %5 %6
 popd
 popd
-pushd libs\%1
-svn merge %2 %3 %4 %5 %6 https://svn.boost.org/svn/boost/branches/release/libs/%1 ^
- https://svn.boost.org/svn/boost/trunk/libs/%1
-popd
-popd
 
 :done

Modified: branches/release/tools/release/snapshot.bat
==============================================================================
--- branches/release/tools/release/snapshot.bat (original)
+++ branches/release/tools/release/snapshot.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -8,6 +8,16 @@
 
 rem Must be run in a directory devoted to boost release snapshots
 
+echo Remove residue from prior runs...
+rem rmdir commands seem to finish before the deletes are necessarily complete.
+rem This can occasionally cause subsequent commands to fail because they expect
+rem the directory to be gone or empty. snapshot_posix and snapshot_windows
+rem are affected. Fix is to run rmdir here so that deletes are complete
+rem by the time snapshots are run.
+rmdir /s /q posix >nul
+rmdir /s /q windows >nul
+time /t
+
 echo Using %BOOST_TRUNK% as boost trunk
 time /t
 pushd %BOOST_TRUNK%
@@ -16,6 +26,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 +36,4 @@
 time /t
 call %BOOST_TRUNK%\tools\release\snapshot_inspection.bat
 time /t
+echo Revision %BOOST_REVISION_NUMBER% snapshot complete

Modified: branches/release/tools/release/snapshot_download_docs.bat
==============================================================================
--- branches/release/tools/release/snapshot_download_docs.bat (original)
+++ branches/release/tools/release/snapshot_download_docs.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -1,5 +1,5 @@
 @echo off
-rem Download and unpack boost-docs.7z
+rem Download and unpack boost-release-docs.7z
 
 rem Copyright 2008 Beman Dawes
 
@@ -10,6 +10,7 @@
 
 echo Deleting old files and directories ...
 del boost-docs.7z 2>nul
+del boost-release-docs.7z 2>nul
 rmdir /s /q docs_temp 2>nul
 mkdir docs_temp
 
@@ -18,13 +19,13 @@
 rem where "userid" and "password" are replace with the appropriate values
 copy user.txt download_docs.ftp
 echo binary >>download_docs.ftp
-echo get boost-docs.7z >>download_docs.ftp
+echo get boost-release-docs.7z >>download_docs.ftp
 echo bye >>download_docs.ftp
 
 echo Running ftp script ...
 ftp -d -n -i -s:download_docs.ftp boost.cowic.de
 
 echo Unpacking 7z file ...
-7z x -y -odocs_temp boost-docs.7z
+7z x -y -odocs_temp boost-release-docs.7z
 
-echo Download and unpack boost-docs.7z complete!
\ No newline at end of file
+echo Download and unpack boost-release-docs.7z complete!
\ No newline at end of file

Modified: branches/release/tools/release/snapshot_posix.bat
==============================================================================
--- branches/release/tools/release/snapshot_posix.bat (original)
+++ branches/release/tools/release/snapshot_posix.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -6,24 +6,19 @@
 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
-xcopy /s /y ..\..\docs_temp\html html
+echo Copying docs into posix...
+pushd posix
+xcopy /s /y ..\docs_temp
 popd
 
 echo Setting SNAPSHOT_DATE
@@ -35,7 +30,7 @@
 ren posix boost-posix-%SNAPSHOT_DATE%
 
 echo Building .gz file...
-tar cfz posix.tar.gz boost-posix-%SNAPSHOT_DATE%
+tar cfz posix.tar.gz --numeric-owner --group=0 --owner=0 boost-posix-%SNAPSHOT_DATE%
 echo Building .bz2 file...
 gzip -d -c posix.tar.gz | bzip2 >posix.tar.bz2
 

Modified: branches/release/tools/release/snapshot_posix.sh
==============================================================================
--- branches/release/tools/release/snapshot_posix.sh (original)
+++ branches/release/tools/release/snapshot_posix.sh 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -20,13 +20,13 @@
 
 #echo "Building bjam..."
 # failure to use an up-to-date copy of bjam has caused much wasted effort.
-#pushd posix/tools/build/v2/engine/src
+#pushd posix/tools/build/v2/engine
 #./build.sh gcc
 #popd
 #
 #echo "Building docs..."
 #pushd posix/doc
-#../tools/build/v2/engine/src/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log
+#../tools/build/v2/engine/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log
 #popd
 
 echo "Cleaning up and renaming..."

Modified: branches/release/tools/release/snapshot_windows.bat
==============================================================================
--- branches/release/tools/release/snapshot_windows.bat (original)
+++ branches/release/tools/release/snapshot_windows.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 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,17 +14,12 @@
 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
-xcopy /s /y ..\..\docs_temp\html html
+echo Copying docs into windows...
+pushd windows
+xcopy /s /y ..\docs_temp
 popd
 
 echo Setting SNAPSHOT_DATE

Modified: branches/release/tools/release/unmerged.bat
==============================================================================
--- branches/release/tools/release/unmerged.bat (original)
+++ branches/release/tools/release/unmerged.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -1,4 +1,6 @@
 @echo off
+rem Copyright Beman Dawes 2009
+rem Distributed under the Boost Software License, Version 1.0. See http://www.boost.org/LICENSE_1_0.txt
 if not %1$==$ goto usage_ok
 echo Usage: unmerged library-name [svn-options]
 echo Options include --summarize to show paths only. i.e. suppresses line-by-line diffs
@@ -6,10 +8,10 @@
 
 :usage_ok
 svn diff %2 %3 %4 %5 %6 http://svn.boost.org/svn/boost/branches/release/boost/%1.hpp ^
- https://svn.boost.org/svn/boost/trunk/boost/%1.hpp
+ http://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 ^
- https://svn.boost.org/svn/boost/trunk/boost/%1
+ http://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 ^
- https://svn.boost.org/svn/boost/trunk/libs/%1
+ http://svn.boost.org/svn/boost/trunk/libs/%1
 
 :done

Modified: branches/release/tools/release/unmerged_all.bat
==============================================================================
--- branches/release/tools/release/unmerged_all.bat (original)
+++ branches/release/tools/release/unmerged_all.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -1,3 +1,5 @@
+rem Copyright Beman Dawes 2009
+rem Distributed under the Boost Software License, Version 1.0. See http://www.boost.org/LICENSE_1_0.txt
 call unmerged accumulators --summarize
 call unmerged algorithm --summarize
 call unmerged any --summarize

Modified: branches/release/tools/release/upload2sourceforge.bat
==============================================================================
--- branches/release/tools/release/upload2sourceforge.bat (original)
+++ branches/release/tools/release/upload2sourceforge.bat 2011-10-06 11:29:43 EDT (Thu, 06 Oct 2011)
@@ -1,3 +1,5 @@
+rem Copyright Beman Dawes 2009
+rem Distributed under the Boost Software License, Version 1.0. See http://www.boost.org/LICENSE_1_0.txt
 if not %1$==$ goto usage_ok
 echo Usage: upload2sourceforge release-folder
 echo Example: upload2sourceforge 1.40.0

Date view Thread view Subject view Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk