Explorar el Código

Remove doc build from snapshot scripts, rename inspect.sh to snapshot_inspect.sh, beef up snapshot scripts.

[SVN r50178]
Beman Dawes hace 17 años
padre
commit
947512c2bf

+ 8 - 3
tools/release/snapshot.sh

@@ -4,6 +4,11 @@
 # Distributed under the Boost Software License, Version 1.0.
 # Distributed under the Boost Software License, Version 1.0.
 # See http://www.boost.org/LICENSE_1_0.txt
 # See http://www.boost.org/LICENSE_1_0.txt
 
 
-./snapshot_posix.sh
-./snapshot_windows.sh
-./inspect.sh
+echo Using $BOOST_TRUNK as boost trunk
+date
+$BOOST_TRUNK/tools/release/snapshot_posix.sh
+date
+$BOOST_TRUNK/tools/release/snapshot_windows.sh
+date
+$BOOST_TRUNK/tools/release/snapshot_inspect.sh
+date

+ 31 - 0
tools/release/snapshot_inspect.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# Inspect snapshot
+
+# © Copyright 2008 Beman Dawes
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+
+# This script uses ftp, and thus assumes ~/.netrc contains a machine ... entry
+
+pushd posix/tools/inspect/build
+bjam
+popd
+echo inspect...
+pushd posix
+dist/bin/inspect >../inspect.html
+popd
+
+# create the ftp script
+echo create ftp script...
+echo "dir" >inspect.ftp
+echo "binary" >>inspect.ftp
+echo "put inspect.html" >>inspect.ftp
+echo "delete inspect-snapshot.html" >>inspect.ftp
+echo "rename inspect.html inspect-snapshot.html" >>inspect.ftp
+echo "dir" >>inspect.ftp
+echo "bye" >>inspect.ftp
+# use cygwin ftp rather than Windows ftp
+echo ftp...
+/usr/bin/ftp -v -i boost.cowic.de <inspect.ftp
+echo inspect.sh complete

+ 11 - 5
tools/release/snapshot_posix.sh

@@ -18,13 +18,19 @@ echo "Exporting files from subversion..."
 svn co --non-recursive http://svn.boost.org/svn/boost/branches/release svn_info
 svn co --non-recursive 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
 svn export --non-interactive --native-eol LF http://svn.boost.org/svn/boost/branches/release posix
 
 
-echo "Building docs..."
-pushd posix/doc
-bjam --v2 --toolset=gcc &>../../posix-bjam.log
-popd
+#echo "Building bjam..."
+# failure to use an up-to-date copy of bjam has caused much wasted effort.
+#pushd posix/tools/jam/src
+#./build.sh gcc
+#popd
+#
+#echo "Building docs..."
+#pushd posix/doc
+#../tools/jam/src/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log
+#popd
 
 
 echo "Cleaning up and renaming..."
 echo "Cleaning up and renaming..."
-rm -r posix/bin.v2
+#rm -r posix/bin.v2
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 mv posix boost-posix-$SNAPSHOT_DATE
 mv posix boost-posix-$SNAPSHOT_DATE

+ 4 - 4
tools/release/snapshot_windows.sh

@@ -20,12 +20,12 @@ svn export --non-interactive --native-eol CRLF http://svn.boost.org/svn/boost/br
 #pushd windows/doc
 #pushd windows/doc
 #bjam-cygwin --v2 --toolset=gcc &>../../windows-bjam.log
 #bjam-cygwin --v2 --toolset=gcc &>../../windows-bjam.log
 #popd
 #popd
-
-echo "Copying docs from posix tree..."
-cp --recursive posix/doc/html windows/doc
+#
+#echo "Copying docs from posix tree..."
+#cp --recursive posix/doc/html windows/doc
 
 
 echo "Cleaning up and renaming..."
 echo "Cleaning up and renaming..."
-rm -r windows/bin.v2
+#rm -r windows/bin.v2
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 mv windows boost-windows-$SNAPSHOT_DATE
 mv windows boost-windows-$SNAPSHOT_DATE

粤ICP备19079148号