[Boost-commit] svn:boost r46796 - branches/release

From: grafikrobot_at_[hidden]
Date: 2008-06-27 18:15:55

Author: grafik
Date: 2008-06-27 18:15:55 EDT (Fri, 27 Jun 2008)
New Revision: 46796
URL: http://svn.boost.org/trac/boost/changeset/46796

Log:
Fix missing links for unversioned libs for MacOSX builds. And correct the Boost version number, and change from hardlinks for shared libs to symlinks. (merge from trunk)
Text files modified: 
   branches/release/Jamroot |    14 +++++++++-----                          
   1 files changed, 9 insertions(+), 5 deletions(-)

Modified: branches/release/Jamroot
==============================================================================
--- branches/release/Jamroot	(original)
+++ branches/release/Jamroot	2008-06-27 18:15:55 EDT (Fri, 27 Jun 2008)
@@ -110,9 +110,10 @@
 import "class" : new ;
 import common ;
 import sequence ;
+import symlink ;
 
 path-constant BOOST_ROOT : . ;
-constant BOOST_VERSION : 1.35.1 ;
+constant BOOST_VERSION : 1.36.0 ;
 constant BOOST_JAMROOT_MODULE : $(__name__) ;
 
 local version-tag = [ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION) ] ;
@@ -406,7 +407,7 @@
             }
             else
             {
-                m = [ MATCH "(.*[.]so[.0-9]+)" "(.*[.]a)" : [ $(s).name ] ] ;
+                m = [ MATCH "(.*[.]so[.0-9]+)" "(.*[.]dylib)" "(.*[.]a)" : [ $(s).name ] ] ;
             }            
             if $(m)
             {
@@ -414,14 +415,14 @@
             }
         }
         
-        # Create hardlinks without version.
+        # Create links 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) ] ;
+              new non-scanning-action $(s) : symlink.ln : $(ep) ] ;
             
             local noversion-file ;
             if $(nt)
@@ -432,6 +433,7 @@
             {
                 noversion-file = 
                   [ MATCH "(.*)-[0-9_]+([.]so)[.0-9]*" : $(name) ] 
+                  [ MATCH "(.*)-[0-9_]+([.]dylib)" : $(name) ] 
                   [ MATCH "(.*)-[0-9_]+([.]a)" : $(name) ] 
                   [ MATCH "(.*)-[0-9_]+([.]dll[.]a)" : $(name) ] ;
             }
@@ -457,7 +459,9 @@
 {
     # Create do-nothing aliases
     alias stage-unversioned ;
+    explicit stage-unversioned ;
     alias install-unversioned ;
+    explicit install-unversioned ;
 }
 
 alias install : install-proper install-unversioned ;
@@ -497,7 +501,7 @@
 }
 
 # Make project ids of all libraries known.
-for local l in $(libraries)
+for local l in $(all-libraries)
 {
     use-project /boost/$(l) : libs/$(l)/build ;
 }