organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-15 17:55:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge from trunk

Browse source 
[SVN r68071]
This commit is contained in:
Beman Dawes 2011-01-12 22:14:11 +00:00
parent f37f90a27b
commit b918fb2e89
6 changed files with 44 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/release/inspect_trunk.bat
View file

@ -10,13 +10,15 @@ echo Clean trunk working copy ...
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%

23
tools/release/merge2release.bat Normal file
View file

@ -0,0 +1,23 @@
rem @echo off
if not %1$==$ goto usage_ok
echo Usage: merge2release library-name [svn-options]
echo Options include --dry-run
goto done
: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
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
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

10
tools/release/snapshot_inspection.bat
View file

@ -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...

10
tools/release/snapshot_posix.bat
View file

@ -13,13 +13,13 @@ rmdir /s /q svn_info >nul
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

10
tools/release/snapshot_windows.bat
View file

@ -13,13 +13,13 @@ rmdir /s /q svn_info >nul
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

6
tools/release/unmerged.bat
View file

@ -6,10 +6,10 @@ goto done
: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