From 7eb16fce02539d211faec13d2750aa99c9c33cbe Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Sun, 28 Nov 2004 04:44:21 +0000 Subject: [PATCH] merge RC_1_32_0 fixes [SVN r26333] --- v1/iw-7_1-vc6-stlp-4_5_3-tools.jam | 3 +++ v1/iw-7_1-vc6-tools.jam | 3 +++ v1/kylix-tools.html | 2 +- v1/mingw-tools.html | 9 +++++++-- v2/doc/src/extending.xml | 2 +- v2/doc/src/install.xml | 4 ++-- v2/index.html | 2 +- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/v1/iw-7_1-vc6-stlp-4_5_3-tools.jam b/v1/iw-7_1-vc6-stlp-4_5_3-tools.jam index aced581a6..b57974cd3 100644 --- a/v1/iw-7_1-vc6-stlp-4_5_3-tools.jam +++ b/v1/iw-7_1-vc6-stlp-4_5_3-tools.jam @@ -11,4 +11,7 @@ extends-toolset intel-win32-stlport ; feature stlport-iostream : on off ; DEFINES = [ difference $(DEFINES) : _STLP_NO_SGI_IOSTREAMS=1 ] ; + # disable auto-linking for this toolset: + # intel toolset lib naming is currently too inconsistent for auto-linking to work. + CFLAGS += "/DBOOST_ALL_NO_LIB=1" ; } diff --git a/v1/iw-7_1-vc6-tools.jam b/v1/iw-7_1-vc6-tools.jam index 2c5f885a6..c689ba8fc 100644 --- a/v1/iw-7_1-vc6-tools.jam +++ b/v1/iw-7_1-vc6-tools.jam @@ -9,4 +9,7 @@ #//Intel
C++ { extends-toolset intel-win32 ; + # disable auto-linking for this toolset: + # intel toolset lib naming is currently too inconsistent for auto-linking to work. + CFLAGS += "/DBOOST_ALL_NO_LIB=1" ; } diff --git a/v1/kylix-tools.html b/v1/kylix-tools.html index a0d2cd0a3..1133c2c02 100644 --- a/v1/kylix-tools.html +++ b/v1/kylix-tools.html @@ -78,7 +78,7 @@ i-checksum="38515" endspan -->

© Copyright John - Maddock2002. All Rights Reserved.

+ Maddock 2002.

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or diff --git a/v1/mingw-tools.html b/v1/mingw-tools.html index 6642d37e8..ae09093a6 100644 --- a/v1/mingw-tools.html +++ b/v1/mingw-tools.html @@ -91,11 +91,16 @@   +

Caution: It appears that none of these paths must contain any + spaces, otherwise spurious file not found errors can result (last + reproduced with GCC3.3.1). To work around this limitation, either install + the MinGW under a path that does not contain spaces or use 8.3 names. For + example, if MinGW is installed in C:\Program Files\Dev-Cpp, "-sMINGW_ROOT_DIRECTORY=C:\Progra~1\Dev-Cpp" + should be specified on the bjam command line.

Revised - - 14 May, 2002

+ 04 November, 2004

Copyright © Dave Abrahams 2002.

diff --git a/v2/doc/src/extending.xml b/v2/doc/src/extending.xml index 05da0aad1..7edf62072 100644 --- a/v2/doc/src/extending.xml +++ b/v2/doc/src/extending.xml @@ -103,7 +103,7 @@ and linked it. In the subsequent sections, we will extend this example, and review all the mechanisms in detail. The complete code is available in example/customization + "../../tools/build/v2/example/customization">example/customization directory. diff --git a/v2/doc/src/install.xml b/v2/doc/src/install.xml index 053b6b156..c81d88b56 100644 --- a/v2/doc/src/install.xml +++ b/v2/doc/src/install.xml @@ -26,7 +26,7 @@ Boost.Build uses Boost.Jam, an + url= "../../tools/build/jam_src/index.html">Boost.Jam, an extension of the Perforce Jam portable make replacement. The @@ -37,7 +37,7 @@ If a prebuilt executable is not provided for your platform or you are using Boost's sources in an unreleased state, it may be neccessary to build bjam + url= "../../tools/build/jam_src/index.html#building_bjam">build bjam from sources included in the Boost source tree. diff --git a/v2/index.html b/v2/index.html index 7dbbad5e5..3f0d79517 100644 --- a/v2/index.html +++ b/v2/index.html @@ -43,7 +43,7 @@ div.sidebar p.rubric {
  • Nightly build: [zip], [tar.bz2]
  • Documentation - (PDF) + (PDF)
  • Wiki (User-contibuted documentation)