diff --git a/tools/release/2release.bat b/tools/release/2release.bat new file mode 100644 index 0000000000..391ac2ea11 --- /dev/null +++ b/tools/release/2release.bat @@ -0,0 +1,16 @@ +@echo off +rem Copyright Beman Dawes 2011 +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: 2release path-relative-to-boost-root [svn-options] +echo Path may be to file or directory +echo Options include --dry-run +echo WARNING: The current directory must be the directory in %BOOST_RELEASE% +echo specified by the path-relative argument +goto done + +:usage_ok +svn merge %2 %3 %4 %5 %6 https://svn.boost.org/svn/boost/branches/release/%1 ^ + https://svn.boost.org/svn/boost/trunk/%1 + +:done diff --git a/tools/release/README b/tools/release/README new file mode 100644 index 0000000000..bb8eaeca59 --- /dev/null +++ b/tools/release/README @@ -0,0 +1,11 @@ +Boost SourceForge release folder README +--------------------------------------- + +The only differences between the distribution files are the line endings +and archive format. The .bz2 and .7z formats are preferred as more compact. + +Distribution files with extensions .gz and .bz2 use Unix line endings. + +Distribution files with extensions .zip and .7z use Windows line endings. + +See http://www.boost.org/users/history for information about each Boost release. diff --git a/tools/release/bjam_warnings.bat b/tools/release/bjam_warnings.bat new file mode 100644 index 0000000000..b45f4b785b --- /dev/null +++ b/tools/release/bjam_warnings.bat @@ -0,0 +1,17 @@ +@echo off +rem Scan bjam/b2 log file for compile warnings + +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 + +if not %1$==$ goto usage_ok +echo Usage: bjam_warnings log-path +goto done + +:usage_ok + +grep -i "warning" %1 | grep -E "boost|libs" | sort | uniq + +:done diff --git a/tools/release/build_release_packages.bat b/tools/release/build_release_packages.bat index c7a18295e8..5f72e5157c 100644 --- a/tools/release/build_release_packages.bat +++ b/tools/release/build_release_packages.bat @@ -41,6 +41,7 @@ echo Creating 7z... echo Cleaning up windows... ren %1 windows +grep "Revision:" snapshot.log echo Build release packages complete :done diff --git a/tools/release/merge2release.bat b/tools/release/merge2release.bat index 38b762590c..39bb01f216 100644 --- a/tools/release/merge2release.bat +++ b/tools/release/merge2release.bat @@ -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 @@ 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 +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 diff --git a/tools/release/merge_release_cycle_init.bat b/tools/release/merge_release_cycle_init.bat new file mode 100644 index 0000000000..3eb3bbe707 --- /dev/null +++ b/tools/release/merge_release_cycle_init.bat @@ -0,0 +1,16 @@ +rem @echo off +rem Copyright Beman Dawes 2011 +rem Distributed under the Boost Software License, Version 1.0. +rem See http://www.boost.org/LICENSE_1_0.txt + +pushd %BOOST_RELEASE% +svn up +call 2release Jamroot +call 2release index.html +pushd boost +call 2release boost/version.hpp +popd +pushd more +call 2release more +popd +popd diff --git a/tools/release/revision_number.bat b/tools/release/revision_number.bat new file mode 100644 index 0000000000..8f03bd0f16 --- /dev/null +++ b/tools/release/revision_number.bat @@ -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 diff --git a/tools/release/snapshot.bat b/tools/release/snapshot.bat index 873b543ee4..5029e3d73b 100644 --- a/tools/release/snapshot.bat +++ b/tools/release/snapshot.bat @@ -8,6 +8,16 @@ rem See http://www.boost.org/LICENSE_1_0.txt 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 @@ svn --non-interactive --trust-server-cert cleanup 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 @@ call %BOOST_TRUNK%\tools\release\snapshot_windows.bat time /t call %BOOST_TRUNK%\tools\release\snapshot_inspection.bat time /t +echo Revision %BOOST_REVISION_NUMBER% snapshot complete diff --git a/tools/release/snapshot_download_docs.bat b/tools/release/snapshot_download_docs.bat index 3479e84f32..5bdae2b5a8 100644 --- a/tools/release/snapshot_download_docs.bat +++ b/tools/release/snapshot_download_docs.bat @@ -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 Downloading docs subdirectory... 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 user.txt must be a single line: user userid password 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 diff --git a/tools/release/snapshot_posix.bat b/tools/release/snapshot_posix.bat index c861a4ff25..1a061dccba 100644 --- a/tools/release/snapshot_posix.bat +++ b/tools/release/snapshot_posix.bat @@ -6,24 +6,19 @@ rem Distributed under the Boost Software License, Version 1.0. 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 @@ echo Renaming root directory... 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 diff --git a/tools/release/snapshot_posix.sh b/tools/release/snapshot_posix.sh index 95f3de02cc..ccc625a999 100755 --- a/tools/release/snapshot_posix.sh +++ b/tools/release/snapshot_posix.sh @@ -20,13 +20,13 @@ svn export --non-interactive --native-eol LF http://svn.boost.org/svn/boost/bran #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..." diff --git a/tools/release/snapshot_windows.bat b/tools/release/snapshot_windows.bat index d8b8c4529e..af31d62610 100644 --- a/tools/release/snapshot_windows.bat +++ b/tools/release/snapshot_windows.bat @@ -6,6 +6,7 @@ rem Distributed under the Boost Software License, Version 1.0. 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 @@ rmdir /s /q svn_info >nul 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 diff --git a/tools/release/unmerged.bat b/tools/release/unmerged.bat index 5a0d169b59..9a3581b8ab 100644 --- a/tools/release/unmerged.bat +++ b/tools/release/unmerged.bat @@ -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 @@ goto done :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 diff --git a/tools/release/unmerged_all.bat b/tools/release/unmerged_all.bat index 437ce0aca5..6bb19dd9f1 100644 --- a/tools/release/unmerged_all.bat +++ b/tools/release/unmerged_all.bat @@ -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 diff --git a/tools/release/unmerged_whatever.bat b/tools/release/unmerged_whatever.bat new file mode 100644 index 0000000000..d49e468b2e --- /dev/null +++ b/tools/release/unmerged_whatever.bat @@ -0,0 +1,13 @@ +@echo off +rem Copyright Beman Dawes 2011 +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_whatever path-from-root [svn-options] +echo Options include --summarize to show paths only. i.e. suppresses line-by-line diffs +goto done + +:usage_ok +svn diff %2 %3 %4 %5 %6 http://svn.boost.org/svn/boost/branches/release/%1 ^ + http://svn.boost.org/svn/boost/trunk/%1 + +:done diff --git a/tools/release/upload2sourceforge.bat b/tools/release/upload2sourceforge.bat index ced6e0f211..f16a2e809b 100644 --- a/tools/release/upload2sourceforge.bat +++ b/tools/release/upload2sourceforge.bat @@ -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