Update of /cvsroot/boost/boost
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14949
Modified Files:
Tag: RC_1_34_0
Jamfile.v2
Log Message:
[merge from head] Switch to using the common.format-name utility instead of the
stage functions. And add copyright and license info.
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/Jamfile.v2,v
retrieving revision 1.32.2.1.2.5
retrieving revision 1.32.2.1.2.6
diff -u -d -r1.32.2.1.2.5 -r1.32.2.1.2.6
--- Jamfile.v2 18 Sep 2006 05:44:00 -0000 1.32.2.1.2.5
+++ Jamfile.v2 16 Oct 2006 22:11:54 -0000 1.32.2.1.2.6
@@ -1,3 +1,12 @@
+# Copyright Vladimir Prus 2002-2006.
+# Copyright Dave Abrahams 2005-2006.
+# Copyright Rene Rivera 2005-2006.
+# Copyright Douglas Gregor 2005.
+#
+# 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)
+
# Usage:
#
# bjam [options] [install|stage]
@@ -97,6 +106,7 @@
import stage ;
import package ;
import path ;
+import common ;
constant BOOST_VERSION : 1.34.0 ;
@@ -235,30 +245,30 @@
{
if $(layout) = versioned
{
- name = [ stage.add-variant-and-compiler $(name)
- : $(type) : $(property-set) ] ;
-
+ local result = [ common.format-name
+ <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
+ : $(name) : $(type) : $(property-set) ] ;
+
# Optionally add version suffix.
- if $(type) != SHARED_LIB ||
- [ $(property-set).get <os> ] in NT CYGWIN MACOSX AIX
- {
- # On NT, library with version suffix won't be recognized
- # by linkers. On CYGWIN, we get strage duplicate symbol
- # errors when library is generated with version suffix.
- # On OSX, version suffix is not needed -- the linker expets
- # libFoo.1.2.3.dylib format.
- # AIX linkers don't accept version suffixes either.
- return $(name:B)-$(BOOST_VERSION_TAG)$(name:S) ;
- }
- else
+ # On NT, library with version suffix won't be recognized
+ # by linkers. On CYGWIN, we get strage duplicate symbol
+ # errors when library is generated with version suffix.
+ # On OSX, version suffix is not needed -- the linker expets
+ # libFoo.1.2.3.dylib format.
+ # AIX linkers don't accept version suffixes either.
+ if $(type) = SHARED_LIB &&
+ ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin
aix )
{
- return
$(name:B)-$(BOOST_VERSION_TAG)$(name:S).$(BOOST_VERSION) ;
+ result = $(result).$(BOOST_VERSION) ;
}
+
+ return $(result) ;
}
else
{
- return [ stage.add-variant-and-compiler $(name)
- : $(type) : $(property-set) ] ;
+ return [ common.format-name
+ boost_ <base> <toolset> <threading> <runtime>
+ : $(name) : $(type) : $(property-set) ] ;
}
}
}
@@ -266,8 +276,8 @@
# Install to system location.
local headers =
- [ path.glob-tree boost : *.hpp *.ipp *.h *.inc ]
- [ path.glob-tree boost/compatibility/cpp_c_headers : c* ]
+ [ path.glob-tree boost : *.hpp *.ipp *.h *.inc : CVS ]
+ [ path.glob-tree boost/compatibility/cpp_c_headers : c* : CVS ]
;
local header-subdir ;
-------------------------------------------------------------------------
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
