Update of /cvsroot/boost/boost
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27469
Modified Files:
Tag: RC_1_34_0
Jamfile.v2
Log Message:
Fix a variety of differences in the install process between BBv1 and BBv2...
versioned subdir for the headers; stage libs only; default built variants,
version tag. (merge from head)
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/Jamfile.v2,v
retrieving revision 1.32.2.1.2.3
retrieving revision 1.32.2.1.2.4
diff -u -d -r1.32.2.1.2.3 -r1.32.2.1.2.4
--- Jamfile.v2 2 Jul 2006 00:43:11 -0000 1.32.2.1.2.3
+++ Jamfile.v2 2 Jul 2006 22:30:37 -0000 1.32.2.1.2.4
@@ -100,6 +100,30 @@
constant BOOST_VERSION : 1.34.0 ;
+local version-tag = [ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION)
] ;
+if $(version-tag[3]) = 0
+{
+ version-tag = $(version-tag[1-2]) ;
+}
+
+constant BOOST_VERSION_TAG : $(version-tag:J="_") ;
+
+local default-build ;
+if $(__file__:D) = ""
+{
+ default-build =
+ debug release
+ <threading>single <threading>multi
+ <runtime-link>shared <runtime-link>static
+ ;
+}
+else
+{
+ default-build =
+ debug
+ ;
+}
+
project boost
: requirements <include>.
# disable auto-linking for all targets here,
@@ -110,15 +134,14 @@
<tag>@$(__name__).tag
: usage-requirements <include>.
: build-dir bin.v2
+ : default-build $(default-build)
;
# Setup convenient aliases for all libraries.
all-libraries =
- [ set.difference
- [ MATCH .*libs/(.*)/build/.* : [ glob libs/*/build/Jamfile.v2 ] ]
- : graph
- ] ;
+ [ MATCH .*libs/(.*)/build/.* : [ glob libs/*/build/Jamfile.v2 ] ]
+ ;
# First, the complicated libraries: where the target name in
# Jamfile is different from directory name.
@@ -184,19 +207,19 @@
}
# what kind of layout are we doing?
-layout = [ MATCH "^--layout=(.*)" : $(ARGV) ] ;
+layout = [ MATCH "^--layout=(.*)" : [ modules.peek : ARGV ] ] ;
layout ?= versioned ;
layout-$(layout) = true ;
# possible stage only location
-local stage-locate = [ MATCH "^--stagedir=(.*)" : $(ARGV) ] ;
+local stage-locate = [ MATCH "^--stagedir=(.*)" : [ modules.peek : ARGV ] ] ;
stage-locate ?= stage ;
path-constant BOOST_STAGE_LOCATE : $(stage-locate) ;
# location of python
-local python-root = [ MATCH "^--with-python-root=(.*)" : $(ARGV) ] ;
+local python-root = [ MATCH "^--with-python-root=(.*)" : [ modules.peek : ARGV
] ] ;
PYTHON_ROOT ?= $(python-root) ;
# Select the libraries to install.
@@ -215,9 +238,6 @@
name = [ stage.add-variant-and-compiler $(name)
: $(type) : $(property-set) ] ;
- local version-tag = [ MATCH "^([^.]+)[.]([^.]+)" :
$(BOOST_VERSION[1]) ] ;
- version-tag = $(version-tag:J="_") ;
-
# Optionally add version suffix.
if $(type) != SHARED_LIB ||
[ $(property-set).get <os> ] in NT CYGWIN MACOSX AIX
@@ -228,11 +248,11 @@
# 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)-$(version-tag)$(name:S) ;
+ return $(name:B)-$(BOOST_VERSION_TAG)$(name:S) ;
}
else
{
- return $(name:B)-$(version-tag)$(name:S).$(BOOST_VERSION) ;
+ return
$(name:B)-$(BOOST_VERSION_TAG)$(name:S).$(BOOST_VERSION) ;
}
}
else
@@ -262,18 +282,26 @@
}
}
+local header-subdir ;
+if $(layout-versioned) { header-subdir = boost-$(BOOST_VERSION_TAG) ; }
+else { header-subdir = boost ; }
+
+
# Complete install
package.install install
- : <install-source-root>. # No specific requirements
- : # No binaries
- : libs/$(libraries)/build
- : $(headers)
+ : <install-source-root>boost
+ <install-header-subdir>$(header-subdir)
+ :
+ : libs/$(libraries)/build
+ : $(headers)
;
# Install just library.
-install stage : libs/$(libraries)/build
- : <location>$(stage-locate)
- ;
+install stage
+ : libs/$(libraries)/build
+ : <location>$(stage-locate)
+ <install-dependencies>on <install-type>LIB
+ ;
# Just build the libraries, don't install them anywhere.
# This is what happend with just "bjam --v2".
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
