Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r74478 - trunk/tools/build/v2/tools
From: grafikrobot_at_[hidden]
Date: 2011-09-20 00:22:57


Author: grafik
Date: 2011-09-20 00:22:53 EDT (Tue, 20 Sep 2011)
New Revision: 74478
URL: http://svn.boost.org/trac/boost/changeset/74478

Log:
Generate minor sdk versions backwards from current sdk version of OSX/iOS. This is the only way left to automatically do anything about registering possible versions. As Apple doesn't provide a comprehensive list of what version values are possible in a single real SDK.
Text files modified:
   trunk/tools/build/v2/tools/darwin.jam | 25 ++++++++++++++++++++-----
   1 files changed, 20 insertions(+), 5 deletions(-)

Modified: trunk/tools/build/v2/tools/darwin.jam
==============================================================================
--- trunk/tools/build/v2/tools/darwin.jam (original)
+++ trunk/tools/build/v2/tools/darwin.jam 2011-09-20 00:22:53 EDT (Tue, 20 Sep 2011)
@@ -231,7 +231,7 @@
     {
         if $(.debug-configuration)
         {
- ECHO notice: available sdk for $(condition)/<macosx-version>$(version-feature) at $(sdk) ;
+ ECHO notice: available sdk for $(condition)/<macosx-version>$(version-feature) at $(root) ;
         }
         
         # Add the version to the features for specifying them.
@@ -247,9 +247,9 @@
         # Set the flags the version needs to compile with, first
         # generic options.
         flags darwin.compile OPTIONS $(condition)/<macosx-version>$(version-feature)
- : -isysroot $(sdk) ;
+ : -isysroot $(root) ;
         flags darwin.link OPTIONS $(condition)/<macosx-version>$(version-feature)
- : -isysroot $(sdk) ;
+ : -isysroot $(root) ;
         
         # Then device variation options.
         switch $(version[1])
@@ -287,13 +287,28 @@
             }
         }
         
- return $(version-feature) ;
+ if $(version[3]) > 0
+ {
+ # We have a minor version of an SDK. We want to set up
+ # previous minor versions, plus the current minor version.
+ # So we recurse to set up the previous minor versions, up to
+ # the current version.
+ local minor-minus-1 = [ CALC $(version[3]) - 1 ] ;
+ return
+ [ init-sdk $(condition) : $(root)
+ : $(version[1-2]) $(minor-minus-1) : [ version-to-feature $(version[1-2]) $(minor-minus-1) ] ]
+ $(version-feature) ;
+ }
+ else
+ {
+ return $(version-feature) ;
+ }
     }
     else if $(version[4])
     {
         # We have a patch version of an SDK. We want to set up
         # both the specific patch version, and the minor version.
- # So we recurse to set up the minor version. Plus the minor version.
+ # So we recurse to set up the patch version. Plus the minor version.
         return
             [ init-sdk $(condition) : $(root)
                 : $(version[1-3]) : [ version-to-feature $(version[1-3]) ] ]


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk