commit ba96707110d5bc11f4c16ccf83ea056de139d230
author thakis@chromium.org <thakis@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> Fri Sep 20 03:41:51 2013 +0000
committer thakis@chromium.org <thakis@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> Fri Sep 20 03:41:51 2013 +0000
tree 56f9f189c0641213810faec4293973278cd696d8
parent 8e62cceb8070a4458fe58648753e1b2cc588f229

ninja/mac: Fix _XcodeVersion parsing for Xcode 3.2. 

BUG=chromium:295322
Review URL: https://codereview.chromium.org/24243013/

Patch from Trent Apted <tapted@chromium.org>!



git-svn-id: http://gyp.googlecode.com/svn/trunk@1738 78cadc50-ecff-11dd-a971-7dbc132099af

pylib/gyp/xcode_emulation.py

diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py
index 7b42262..ef84df8 100644
--- a/pylib/gyp/xcode_emulation.py
+++ b/pylib/gyp/xcode_emulation.py
@@ -777,8 +777,14 @@
     # `xcodebuild -version` output looks like
     #    Xcode 4.6.3
     #    Build version 4H1503
+    # or like
+    #    Xcode 3.2.6
+    #    Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
+    #    BuildVersion: 10M2518
     # Convert that to '0463', '4H1503'.
-    version, build = self._GetStdout(['xcodebuild', '-version']).splitlines()
+    version_list = self._GetStdout(['xcodebuild', '-version']).splitlines()
+    version = version_list[0]
+    build = version_list[-1]
     # Be careful to convert "4.2" to "0420":
     version = version.split()[-1].replace('.', '')
     version = (version + '0' * (3 - len(version))).zfill(4)