Update of /cvsroot/boost/boost
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24161
Modified Files:
Tag: RC_1_34_0
Jamfile.v2
Log Message:
Merge: Create unversioned hardlinks
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/Jamfile.v2,v
retrieving revision 1.32.2.1.2.15
retrieving revision 1.32.2.1.2.16
diff -u -d -r1.32.2.1.2.15 -r1.32.2.1.2.16
--- Jamfile.v2 10 Nov 2006 16:29:29 -0000 1.32.2.1.2.15
+++ Jamfile.v2 10 Nov 2006 17:32:44 -0000 1.32.2.1.2.16
@@ -112,6 +112,9 @@
import common ;
import os ;
import regex ;
+import errors ;
+import "class" : new ;
+import common ;
constant BOOST_VERSION : 1.34.0 ;
@@ -326,20 +329,97 @@
# Complete install
-package.install install
- : $(install-requirements)
+package.install install-proper
+ : $(install-requirements) <install-no-version-symlinks>on
:
: libs/$(libraries)/build
: $(headers)
;
# Install just library.
-install stage
+install stage-proper
: libs/$(libraries)/build
- : <location>$(stage-locate)
+ : <location>$(stage-locate)/lib
<install-dependencies>on <install-type>LIB
+ <install-no-version-symlinks>on
;
+
+if $(layout-versioned)
+ && ( [ modules.peek : NT ] || [ modules.peek : UNIX ] )
+{
+ rule make-unversioned-links ( project name ? : property-set : sources * )
+ {
+ local result ;
+ local filtered ;
+ local pattern ;
+ local nt = [ modules.peek : NT ] ;
+
+ # Collect the libraries that have the version number in 'filtered'.
+ for local s in $(sources)
+ {
+ local m ;
+ if $(nt)
+ {
+ m = [ MATCH "(.*[.]lib)" : [ $(s).name ] ] ;
+ }
+ else
+ {
+ m = [ MATCH "(.*[.]so[.0-9]+)" "(.*[.]a)" : [ $(s).name ] ] ;
+ }
+ if $(m)
+ {
+ filtered += $(s) ;
+ }
+ }
+
+ # Create hardlinks without version.
+ for local s in $(filtered)
+ {
+ local name = [ $(s).name ] ;
+ local ea = [ $(s).action ] ;
+ local ep = [ $(ea).properties ] ;
+ local a = [
+ new non-scanning-action $(s) : common.hard-link : $(ep) ] ;
+
+ local noversion-file ;
+ if $(nt)
+ {
+ noversion-file = [ MATCH "(.*)-[0-9_]+([.]lib)" : $(name) ] ;
+ }
+ else
+ {
+ noversion-file =
+ [ MATCH "(.*)-[0-9_]+([.]so)[.0-9]*" : $(name) ]
+ [ MATCH "(.*)-[0-9_]+([.]a)" : $(name) ] ;
+ }
+
+ local new-name =
+ $(noversion-file[1])$(noversion-file[2]) ;
+ result += [ new file-target $(new-name) exact : [ $(s).type ] :
$(project)
+ : $(a) ] ;
+
+ }
+ return $(result) ;
+ }
+
+ generate stage-unversioned : stage-proper :
+ <generating-rule>@make-unversioned-links ;
+
+ generate install-unversioned : install-proper :
+ <generating-rule>@make-unversioned-links ;
+}
+else
+{
+ # Create do-nothing aliases
+ alias stage-unversioned ;
+ alias install-unversioned ;
+}
+
+alias install : install-proper install-unversioned ;
+alias stage : stage-proper stage-unversioned ;
+
+
# Just build the libraries, don't install them anywhere.
# This is what happend with just "bjam --v2".
alias build_all : libs/$(libraries)/build ;
-------------------------------------------------------------------------
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
