From 54cd7fa438323b12593b080aa43f6ffaee130630 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 19 Jun 2018 08:25:24 -0500 Subject: [PATCH] Minor fixes for old URLs. And remove obsolete scripts. --- CONTRIBUTING.rst | 21 +++++++------- README.rst | 2 +- scripts/build-docs.sh | 34 ----------------------- scripts/nightly.sh | 30 -------------------- scripts/roll.sh | 64 ------------------------------------------- scripts/to_merge.sh | 16 ----------- 6 files changed, 11 insertions(+), 156 deletions(-) delete mode 100755 scripts/build-docs.sh delete mode 100755 scripts/nightly.sh delete mode 100755 scripts/roll.sh delete mode 100755 scripts/to_merge.sh diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 77a071dfe..ba85075b1 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -23,7 +23,7 @@ Additional resources include - The issue tracker - http://trac.lvk.cs.msu.su/boost.build/ + https://github.com/boostorg/build - mailing list @@ -34,7 +34,7 @@ Additional resources include BUGS and PATCHES ---------------- -Both bugs and patches can be send to our mailing list. +Both bugs and patches can be submitted to the GitHub tracker. When reporting a bug, please try to provide the following information. @@ -52,21 +52,20 @@ When reporting a bug, please try to provide the following information. - What you expected. - What version of Boost.Build and Boost.Jam did you use. If possible, - please try to test with the CVS HEAD state. + please try to test with the develop branch state. When submitting a patch, please: - make a single patch for a single logical change - follow the policies and coding conventions below, -- send patches in unified diff format, (using either "cvs diff -u" or "diff -u") -- provide a log message together with the patch -- put the patch and the log message as attachment to your email. +- send patches as pull requests +- provide a good PR message together with the patch -The purpose of log message serves to communicate what was changed, and *why*. -Without a good log message, you might spend a lot of time later, wondering where +The purpose of message serves to communicate what was changed, and *why*. +Without a good message, you might spend a lot of time later, wondering where a strange piece of code came from and why it was necessary. -The good log message mentions each changed file and each rule/method, saying +The good message mentions each changed file and each rule/method, saying what happend to it, and why. Consider, the following log message :: @@ -84,10 +83,10 @@ what happend to it, and why. Consider, the following log message (virtual-target.actualize-no-scanner): Call the above, to detected bugs, where two virtual target correspond to one Jam target name. -The log messages for the last two files are good. They tell what was changed. +The messages for the last two files are good. They tell what was changed. The change to the first file is clearly undercommented. -It's OK to use terse log messages for uninteresting changes, like ones induced +It's OK to use terse messages for uninteresting changes, like ones induced by interface changes elsewhere. POLICIES. diff --git a/README.rst b/README.rst index fe0a6f394..dc88cc755 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ Boost.Build =========== -See the Boost.Build website at https://boost.org/build. +See the Boost.Build website at https://boostorg.github.io/build/. See the `guidelines for contributing <./CONTRIBUTING.rst>`__. diff --git a/scripts/build-docs.sh b/scripts/build-docs.sh deleted file mode 100755 index f0b3417e1..000000000 --- a/scripts/build-docs.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2014 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -set -e - -# Build the documentation -touch doc/jamroot.jam -export BOOST_BUILD_PATH=`pwd` -export BOOST_ROOT=/home/ghost/Sources/boost -./bootstrap.sh -cd doc -../b2 - -find . -type f -iname "*.html" | while read i; do - echo "Processing: $i" - sed -i "s##\ - \n\ -#g" "$i" - -done - diff --git a/scripts/nightly.sh b/scripts/nightly.sh deleted file mode 100755 index c6b254d70..000000000 --- a/scripts/nightly.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2004, 2005, 2006 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -# This script create a nightly tarball of Boost.Build V2 -# and updates the web site. - -# Create the packages -set -e -trap "echo 'Nightly build failed'" ERR - -export QTDIR=/usr/share/qt3 -export LC_ALL=C -export LC_MESSAGES=C -export LANG=C -cd /tmp -rm -rf boost-build-nightly -mkdir boost-build-nightly -echo "Checking out sources" -svn co http://svn.boost.org/svn/boost/trunk/tools/build/v2 boost-build-nightly/boost-build > /tmp/boost_build_checkout_log -mv /tmp/boost_build_checkout_log boost-build-nightly/checkout-log -cd boost-build-nightly/boost-build/ -echo "Building packages and uploading docs" -./roll.sh > ../roll-log 2>&1 -cd .. -echo "Uploading packages" -scp boost-build.zip boost-build.tar.bz2 vladimir_prus,boost@web.sourceforge.net:/home/groups/b/bo/boost/htdocs/boost-build2 > scp-log -echo "Nightly build successful" diff --git a/scripts/roll.sh b/scripts/roll.sh deleted file mode 100755 index e58d269ba..000000000 --- a/scripts/roll.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2004 Aleksey Gurtovoy -# Copyright 2006 Rene Rivera -# Copyright 2003, 2004, 2005, 2006 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -set -e - -# Capture the version -revision=`svnversion .` -echo "SVN Revision $revision" >> timestamp.txt -date >> timestamp.txt - -# Remove unnecessary top-level files -find . -maxdepth 1 -type f | egrep -v "boost-build.jam|timestamp.txt|roll.sh|bootstrap.jam|build-system.jam|boost_build.png|index.html|hacking.txt|site-config.jam|user-config.jam|bootstrap.sh|bootstrap.bat|Jamroot.jam" | xargs rm -f - -# Build the documentation -touch doc/jamroot.jam -export BOOST_BUILD_PATH=`pwd` -./bootstrap.sh -cd doc -../bjam --v2 -../bjam --v2 pdf -cp `find bin -name "*.pdf"` ../.. -mv ../../standalone.pdf ../../userman.pdf -cp ../../userman.pdf . -rm -rf bin -cd .. -rm bjam - -# Get the boost logo. -wget http://boost.sf.net/boost-build2/boost.png - -# Adjust the links, so they work with the standalone package -perl -pi -e 's%../../../boost.png%boost.png%' index.html -perl -pi -e 's%../../../doc/html/bbv2.html%doc/html/index.html%' index.html -perl -pi -e 's%../../../doc/html/bbv2.installation.html%doc/html/bbv2.installation.html%' index.html - -# Make packages -find . -name ".svn" | xargs rm -rf -rm roll.sh -chmod a+x engine/build.bat -cd .. && zip -r boost-build.zip boost-build && tar --bzip2 -cf boost-build.tar.bz2 boost-build -# Copy packages to a location where they are grabbed for beta.boost.org -cp userman.pdf boost-build.zip boost-build.tar.bz2 ~/public_html/boost_build_nightly -cd boost-build - -chmod -R u+w * -# Upload docs to sourceforge -x=`cat < - - -EOF` -echo $x -perl -pi -e "s||$x|" index.html `find doc -name '*.html'` -scp -r doc example boost_build.png *.html hacking.txt vladimir_prus,boost@web.sourceforge.net:/home/groups/b/bo/boost/htdocs/boost-build2 -scp ../userman.pdf vladimir_prus,boost@web.sourceforge.net:/home/groups/b/bo/boost/htdocs/boost-build2/doc diff --git a/scripts/to_merge.sh b/scripts/to_merge.sh deleted file mode 100755 index 89857785a..000000000 --- a/scripts/to_merge.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -for python in build/*.py; do - jam="${python%.py}.jam" - if [ -f "$jam" ]; then - line=`grep "Base revision" $python` - revision=`echo $line | sed 's/# Base revision: \([0-9]*\).*/\1/'` - if [ -e "$revision" ] ; then - echo "No base version for $python" >&2 - else - svn diff -r $revision:HEAD "$jam" - fi - fi -done - -