|
|
Boost-Commit : |
From: dave_at_[hidden]
Date: 2007-11-18 00:52:18
Author: dave
Date: 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
New Revision: 41191
URL: http://svn.boost.org/trac/boost/changeset/41191
Log:
Roll in changes from trunk
Text files modified:
branches/bitten/tools/build/v2/build/toolset.jam | 9 ---------
branches/bitten/tools/build/v2/index.html | 8 ++++++++
branches/bitten/tools/build/v2/tools/borland.jam | 2 +-
branches/bitten/tools/build/v2/tools/builtin.jam | 4 +++-
branches/bitten/tools/build/v2/tools/darwin.jam | 2 +-
branches/bitten/tools/build/v2/tools/intel.jam | 2 +-
branches/bitten/tools/build/v2/tools/msvc.jam | 26 +++++++++++++++++++-------
branches/bitten/tools/build/v2/tools/pathscale.jam | 1 +
branches/bitten/tools/build/v2/tools/qt4.jam | 2 --
branches/bitten/tools/build/v2/tools/vacpp.jam | 8 +++++++-
10 files changed, 41 insertions(+), 23 deletions(-)
Modified: branches/bitten/tools/build/v2/build/toolset.jam
==============================================================================
--- branches/bitten/tools/build/v2/build/toolset.jam (original)
+++ branches/bitten/tools/build/v2/build/toolset.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -360,15 +360,6 @@
}
}
-.toolsets += $(toolset) ;
-
-# Registers a new toolset
-rule register ( toolset )
-{
- feature.extend toolset : $(toolset) ;
- .toolsets += $(toolset) ;
-}
-
# Make toolset 'toolset', defined in a module of the same name,
# inherit from 'base'
# 1. The 'init' rule from 'base' is imported into 'toolset' with full
Modified: branches/bitten/tools/build/v2/index.html
==============================================================================
--- branches/bitten/tools/build/v2/index.html (original)
+++ branches/bitten/tools/build/v2/index.html 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -159,6 +159,14 @@
<!--webbot bot="Timestamp" endspan i-checksum="13972"
-->
</p>
+
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-2917240-2";
+urchinTracker();
+</script>
</body>
</html>
+a
Modified: branches/bitten/tools/build/v2/tools/borland.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/borland.jam (original)
+++ branches/bitten/tools/build/v2/tools/borland.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -14,7 +14,7 @@
import type ;
import common ;
-toolset.register borland ;
+feature.extend toolset : borland ;
rule init ( version ? : command * : options * )
{
Modified: branches/bitten/tools/build/v2/tools/builtin.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/builtin.jam (original)
+++ branches/bitten/tools/build/v2/tools/builtin.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -1,5 +1,5 @@
# Copyright 2002, 2003, 2004, 2005 Dave Abrahams
-# Copyright 2002, 2005, 2006 Rene Rivera
+# Copyright 2002, 2005, 2006, 2007 Rene Rivera
# Copyright 2006 Juergen Hunold
# Copyright 2005 Toon Knapen
# Copyright 2002, 2003, 2004, 2005, 2006 Vladimir Prus
@@ -214,6 +214,8 @@
i386 i486 i586 i686
pentium pentium-mmx pentiumpro pentium2 pentium3 pentium3m pentium-m pentium4 pentium4m
prescott nocona
+ conroe conroe-xe conroe-l allendale mermon mermon-xe kentsfield kentsfield-xe
+ penryn wolfdale yorksfield nehalem
k6 k6-2 k6-3 athlon athlon-tbird athlon-4 athlon-xp athlon-mp
k8 opteron athlon64 athlon-fx
winchip-c6 winchip2
Modified: branches/bitten/tools/build/v2/tools/darwin.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/darwin.jam (original)
+++ branches/bitten/tools/build/v2/tools/darwin.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -13,7 +13,7 @@
import common ;
import generators ;
-toolset.register darwin ;
+feature.extend toolset : darwin ;
import gcc ;
toolset.inherit-generators darwin : gcc ;
Modified: branches/bitten/tools/build/v2/tools/intel.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/intel.jam (original)
+++ branches/bitten/tools/build/v2/tools/intel.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -16,7 +16,7 @@
rule init ( * : * )
{
- if [ os.name ] = LINUX
+ if [ os.name ] = LINUX || [ os.name ] = MACOSX
{
toolset.using intel-linux :
$(1) : $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
Modified: branches/bitten/tools/build/v2/tools/msvc.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/msvc.jam (original)
+++ branches/bitten/tools/build/v2/tools/msvc.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -3,6 +3,7 @@
# Copyright (c) 2005 Alexey Pakhunov.
# Copyright (c) 2006 Bojan Resnik.
# Copyright (c) 2006 Ilya Sokolov.
+# Copyright (c) 2007 Rene Rivera
#
# Use, modification and distribution is subject to the Boost Software
# License Version 1.0. (See accompanying file LICENSE_1_0.txt or
@@ -231,6 +232,10 @@
{
# Even if version is not explicitly specified, try to detect the version
# from the path.
+ if [ MATCH "(Microsoft Visual Studio 9)" : $(command) ]
+ {
+ version = 9.0 ;
+ }
if [ MATCH "(Microsoft Visual Studio 8)" : $(command) ]
{
version = 8.0 ;
@@ -299,8 +304,9 @@
if ! $(below-8.0)
{
cpu = i386 amd64 ia64 ;
- # Whereas http://msdn2.microsoft.com/en-us/library/x4d2c09s(VS.80).aspx
- # say about x86_ipf, that seem to be doc bug,
+ # Whereas http://msdn2.microsoft.com/en-us/library/x4d2c09s(VS.80).aspx or
+ # http://msdn2.microsoft.com/en-us/library/x4d2c09s(vs.90).aspx
+ # say about x86_IPF, that seem to be doc bug,
# and x86_ia64 is right one.
setup-option = x86 x86_amd64 x86_ia64 ;
@@ -394,13 +400,16 @@
}
-# Supported CPU types
+# Supported CPU types (only Itanium optimization options are supported from
+# VC++ 2005 on). See http://msdn2.microsoft.com/en-us/library/h66s5s0e(vs.90).aspx
cpu-type-g5 = i586 pentium pentium-mmx ;
cpu-type-g6 =
i686 pentiumpro pentium2 pentium3 pentium3m pentium-m k6 k6-2 k6-3
winchip-c6 winchip2 c3 c3-2 ;
-cpu-type-em64t = prescott nocona ;
+cpu-type-em64t = prescott nocona
+ conroe conroe-xe conroe-l allendale mermon mermon-xe kentsfield kentsfield-xe
+ penryn wolfdale yorksfield nehalem ;
cpu-type-amd64 = k8 opteron athlon64 athlon-fx ;
cpu-type-g7 =
@@ -465,12 +474,12 @@
}
else
{
- # 8.0 adds some more options
+ # 8.0 and above adds some more options
flags $(toolset).compile CFLAGS $(condition)/$(cpu-arch-amd64)/<instruction-set> : /favor:blend ;
flags $(toolset).compile CFLAGS $(condition)/$(cpu-arch-amd64)/<instruction-set>$(cpu-type-em64t) : /favor:EM64T ;
flags $(toolset).compile CFLAGS $(condition)/$(cpu-arch-amd64)/<instruction-set>$(cpu-type-amd64) : /favor:AMD64 ;
- # 8.0 only has multi-threaded static RTL
+ # 8.0 and above only has multi-threaded static RTL
flags $(toolset).compile CFLAGS $(condition)/<runtime-debugging>off/<runtime-link>static/<threading>single : /MT ;
flags $(toolset).compile CFLAGS $(condition)/<runtime-debugging>on/<runtime-link>static/<threading>single : /MTd ;
}
@@ -916,13 +925,14 @@
.ProgramFiles = [ path.make [ common.get-program-files-dir ] ] ;
-.known-versions = 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
+.known-versions = 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
# Version aliases
.version-alias-6 = 6.0 ;
.version-alias-6.5 = 6.0 ;
.version-alias-7 = 7.0 ;
.version-alias-8 = 8.0 ;
+.version-alias-9 = 9.0 ;
# Name of the registry key that contains Visual C++ installation path
# (relative to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft"
@@ -931,6 +941,8 @@
.version-7.1-reg = "VisualStudio\\7.1\\Setup\\VC" ;
.version-8.0-reg = "VisualStudio\\8.0\\Setup\\VC" ;
.version-8.0express-reg = "VCExpress\\8.0\\Setup\\VC" ;
+.version-9.0-reg = "VisualStudio\\9.0\\Setup\\VC" ;
+.version-9.0express-reg = "VCExpress\\9.0\\Setup\\VC" ;
# Visual C++ Toolkit 2003 do not store its installation path in the registry.
# The environment variable 'VCToolkitInstallDir' and the default installation
Modified: branches/bitten/tools/build/v2/tools/pathscale.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/pathscale.jam (original)
+++ branches/bitten/tools/build/v2/tools/pathscale.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -112,6 +112,7 @@
flags pathscale.link FINDLIBS-ST <find-static-library> ;
flags pathscale.link FINDLIBS-SA <find-shared-library> ;
flags pathscale.link FINDLIBS-SA <threading>multi : pthread ;
+flags pathscale.link FINDLIBS-SA <threading>multi : rt ;
flags pathscale.link LIBRARIES <library-file> ;
flags pathscale.link LINK-RUNTIME <runtime-link>static : static ;
flags pathscale.link LINK-RUNTIME <runtime-link>shared : dynamic ;
Modified: branches/bitten/tools/build/v2/tools/qt4.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/qt4.jam (original)
+++ branches/bitten/tools/build/v2/tools/qt4.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -206,7 +206,6 @@
: # usage-requirements
<define>QT_GUI_LIB
<include>$(.incprefix)/QtGui
- <user-interface>gui
;
lib QtGui : QtCore
@@ -217,7 +216,6 @@
: # usage-requirements
<define>QT_GUI_LIB
<include>$(.incprefix)/QtGui
- <user-interface>gui
;
lib QtNetwork : QtCore
Modified: branches/bitten/tools/build/v2/tools/vacpp.jam
==============================================================================
--- branches/bitten/tools/build/v2/tools/vacpp.jam (original)
+++ branches/bitten/tools/build/v2/tools/vacpp.jam 2007-11-18 00:52:17 EST (Sun, 18 Nov 2007)
@@ -18,11 +18,17 @@
toolset.inherit vacpp : unix ;
generators.override vacpp.prebuilt : builtin.lib-generator ;
generators.override vacpp.searched-lib-generator : searched-lib-generator ;
-feature.subfeature toolset vacpp : version ;
# Configure the vacpp toolset
rule init ( version ? : command * : options * )
{
+ local condition = [
+ common.check-init-parameters vacpp : version $(version) ] ;
+
+ command = [ common.get-invocation-command vacpp : xlC
+ : $(command) : "/usr/vacpp/bin/xlC" ] ;
+
+ common.handle-options vacpp : $(condition) : $(command) : $(options) ;
}
# Declare generators
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk