[Boost-commit] svn:boost r47066 - trunk/tools/build/v2/tools

From: grafikrobot_at_[hidden]
Date: 2008-07-03 23:51:30

Author: grafik
Date: 2008-07-03 23:51:29 EDT (Thu, 03 Jul 2008)
New Revision: 47066
URL: http://svn.boost.org/trac/boost/changeset/47066

Log:
Fix empty macosx sdk version when dealing with an sdk with major-minor-patch numbers. Likely because of a bjam variable expansion bug.
Text files modified: 
   trunk/tools/build/v2/tools/darwin.jam |    13 +++++++------                           
   1 files changed, 7 insertions(+), 6 deletions(-)

Modified: trunk/tools/build/v2/tools/darwin.jam
==============================================================================
--- trunk/tools/build/v2/tools/darwin.jam	(original)
+++ trunk/tools/build/v2/tools/darwin.jam	2008-07-03 23:51:29 EDT (Thu, 03 Jul 2008)
@@ -198,23 +198,24 @@
     local result ;
     for local sdk in $(sdks)
     {
-        local sdk-version = [ MATCH ([^0-9]+)([0-9]+)[.]([0-9x]+)[.]?([0-9x]+)? : $(sdk:D=) ] ;
-        sdk-version = $(sdk-version[1]:L) $(sdk-version[2-3]:J=.) ;
+        local sdk-match = [ MATCH ([^0-9]+)([0-9]+)[.]([0-9x]+)[.]?([0-9x]+)? : $(sdk:D=) ] ;
+        local sdk-platform = $(sdk-match[1]:L) ;
+        local sdk-version = $(sdk-match[2]).$(sdk-match[3]) ;
         if $(sdk-version)
         {
-            switch $(sdk-version[1])
+            switch $(sdk-platform)
             {
                 case macosx :
                 {
-                    sdk-version = $(sdk-version[2]) ;
+                    sdk-version = $(sdk-version) ;
                 }
                 case iphoneos :
                 {
-                    sdk-version = iphone-$(sdk-version[2]) ;
+                    sdk-version = iphone-$(sdk-version) ;
                 }
                 case iphonesimulator :
                 {
-                    sdk-version = iphonesim-$(sdk-version[2]) ;
+                    sdk-version = iphonesim-$(sdk-version) ;
                 }
                 case * :
                 {