[78908] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 78908
          http://trac.macports.org/changeset/78908
Author:   jmr at macports.org
Date:     2011-05-26 07:36:54 -0700 (Thu, 26 May 2011)
Log Message:
-----------
add some more DevToolsCore versions to use when xcodebuild doesn't print the Xcode version for some reason (#26391)

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2011-05-26 13:57:02 UTC (rev 78907)
+++ trunk/base/src/macports1.0/macports.tcl	2011-05-26 14:36:54 UTC (rev 78908)
@@ -369,7 +369,14 @@
                 if {[regexp {Xcode ([0-9.]+)} $xcodebuildversion - xcode_v] == 1} {
                     set macports::xcodeversion $xcode_v
                 } elseif {[regexp "DevToolsCore-(.*);" $xcodebuildversion - devtoolscore_v] == 1} {
-                    if {$devtoolscore_v >= 921.0} {
+                    if {$devtoolscore_v >= 1809.0} {
+                        set macports::xcodeversion "3.2.6"
+                    } elseif {$devtoolscore_v >= 1204.0} {
+                        set macports::xcodeversion "3.1.4"
+                    } elseif {$devtoolscore_v > 921.0} {
+                        # XXX find actual version corresponding to 3.1
+                        set macports::xcodeversion "3.1"
+                    } elseif {$devtoolscore_v >= 921.0} {
                         set macports::xcodeversion "3.0"
                     } elseif {$devtoolscore_v >= 798.0} {
                         set macports::xcodeversion "2.5"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110526/227f2ced/attachment.html>