Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31469/tools/build/v2/tools
Modified Files:
stage.jam
Log Message:
Remove now outdated stage renaming of targets, moved to common.jam.
Index: stage.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/stage.jam,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- stage.jam 21 Oct 2006 10:37:21 -0000 1.80
+++ stage.jam 23 Oct 2006 23:57:42 -0000 1.81
@@ -468,133 +468,3 @@
IMPORT $(__name__) : install : : install ;
IMPORT $(__name__) : install : : stage ;
-
-rule add-variant-and-compiler ( name : type ? : property-set )
-{
- return [ rename $(name) : $(type) : $(property-set) ] ;
-}
-
-rule add-variant ( name : type ? : property-set )
-{
- return [ rename $(name) : $(type) : $(property-set) : unversioned ] ;
-}
-
-rule rename ( name : type ? : property-set : unversioned ? )
-{
- if [ type.is-derived $(type) LIB ]
- {
- local properties = [ $(property-set).raw ] ;
-
- local tags = ;
-
- local thread-tag ;
- if <threading>multi in $(properties) { thread-tag = mt ; }
-
- local runtime-tag = ;
- if <runtime-link>static in $(properties) { runtime-tag += s ; }
- if <runtime-debugging>on in $(properties) { runtime-tag += g ; }
-
- if <variant>debug-python in $(properties) { runtime-tag += y ; }
- if <variant>debug in $(properties) { runtime-tag += d ; }
- if <stdlib>stlport in $(properties) { runtime-tag += p ; }
- if <stdlib-stlport:iostream>hostios in $(properties) { runtime-tag +=
n ; }
-
- local toolset-tag = ;
- # 'unversioned' should be a parameter.
- if ! $(unversioned)
- {
- switch [ $(property-set).get <toolset> ]
- {
- case borland* : toolset-tag += bcb ;
- case como* : toolset-tag += como ;
- case cw : toolset-tag += cw ;
- case darwin* : toolset-tag += ;
- case edg* : toolset-tag += edg ;
- case gcc* : toolset-tag += gcc ;
- case intel :
- if [ $(property-set).get <toolset-intel:platform> ] = win
- {
- toolset-tag += iw ;
- }
- else
- {
- toolset-tag += il ;
- }
- case kcc* : toolset-tag += kcc ;
- case kylix* : toolset-tag += bck ;
- #case metrowerks* : toolset-tag += cw ;
- #case mingw* : toolset-tag += mgw ;
- case mipspro* : toolset-tag += mp ;
- case msvc* : toolset-tag += vc ;
- case sun* : toolset-tag += sw ;
- case tru64cxx* : toolset-tag += tru ;
- case vacpp* : toolset-tag += xlc ;
- }
- local version = [ MATCH
"<toolset.*version>([0123456789]+)[.]([0123456789]*)" : $(properties) ] ;
- # For historical reasons, vc6.0 and vc7.0 use different
- # naming.
- if $(toolset-tag) = vc
- {
- if $(version[1]) = 6
- {
- # Cancel minor version.
- version = 6 ;
- }
- else if $(version[1]) = 7 && $(version[2]) = 0
- {
- version = 7 ;
- }
- }
- # On intel, version is not added, because it does not
- # matter and it's the version of vc used as backend
- # that matters. Ideally, we'd encode the backend
- # version but that will break compatibility with
- # V1.
- if $(toolset-tag) = iw
- {
- version = ;
- }
-
- # On borland, version is not added for compatibility
- # with V1.
- if $(toolset-tag) = bcb
- {
- version = ;
- }
-
- toolset-tag += $(version) ;
- }
-
- # Note yet clear if this should be added on Linux (where we have
- # version in soname) and how it should be done on Windows.
- #local version-tag = ;
- #if ! $(gUNVERSIONED_VARIANT_TAG)
- #{
- # local version-number = [ get-values <version> : $(properties) ] ;
- # version-number ?= $(BOOST_VERSION) ;
- # version-tag = [ MATCH "^([^.]+)[.]([^.]+)" : $(version-number[1])
] ;
- # version-tag = $(version-tag:J="_") ;
- #}
-
- tags += $(toolset-tag:J=) ;
- tags += $(thread-tag:J=) ;
- tags += $(runtime-tag:J=) ;
- #tags += $(version-tag) ;
-
- local result ;
-
- if $(tags)
- {
- result = $(name)-$(tags:J=-) ;
- }
- else
- {
- result = $(name) ;
- }
- return [ virtual-target.add-prefix-and-suffix $(result) : $(type)
- : $(property-set) ] ;
- }
-}
-
-
-
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
