From 81286d388abf5c8f946f3f4be274bd987a690952 Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu, 30 Aug 2018 19:36:59 -0700
Subject: [PATCH 1/2] infra: remove cq.cfg, which is no longer used.

R=dpranke

No-Try: True
No-Presubmit: True
Change-Id: I45f4946778f3f9ca7eef30bcd9c6e714134bcb3f
Reviewed-on: https://chromium-review.googlesource.com/1198344
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
---
 infra/config/cq.cfg | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 infra/config/cq.cfg

diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg
deleted file mode 100644
index 57542c45..00000000
--- a/infra/config/cq.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-# Commit Queue configuration file. The documentation of the format can be found
-# at http://luci-config.appspot.com/schemas/projects/refs:cq.cfg.
-
-version: 1
-cq_name: "gyp"
-cq_status_url: "https://chromium-cq-status.appspot.com"
-git_repo_url: "https://chromium.googlesource.com/external/gyp.git"
-
-gerrit {}
-
-verifiers {
-  gerrit_cq_ability {
-    committer_list: "project-gyp-committers"
-    dry_run_access_list: "project-gyp-tryjob-access"
-  }
-
-  try_job {
-    buckets {
-      name: "luci.gyp.try"
-      builders { name: "linux" }
-      builders { name: "mac" }
-      builders { name: "win" }
-    }
-  }
-}

From d0d6e59725db66e04ac01ed1d8f40b7b3ffb253b Mon Sep 17 00:00:00 2001
From: Pyry Jahkola <pyry.jahkola@iki.fi>
Date: Thu, 18 Oct 2018 17:46:15 +0300
Subject: [PATCH 2/2] Fix XcodeVersion() parsing for Xcode 10.0

Changes the output from '0100' to '1000' and fixes the parsing of `CLTVersion()` output too in case `xcodebuild -version` prints an unexpected output.
---
 pylib/gyp/xcode_emulation.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py
index dba8e769..8f764ccc 100644
--- a/pylib/gyp/xcode_emulation.py
+++ b/pylib/gyp/xcode_emulation.py
@@ -1403,16 +1403,16 @@ def XcodeVersion():
   except:
     version = CLTVersion()
     if version:
-      version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0]
+      version = re.search(r'^(\d{1,2}\.\d(\.\d+)?)', version).groups()[0]
     else:
       raise GypError("No Xcode or CLT version detected!")
     # The CLT has no build information, so we return an empty string.
     version_list = [version, '']
   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)
+  # Be careful to convert "4.2" to "0420" and "10.0" to "1000":
+  version = format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
+                   '>04s')
   if build:
     build = build.split()[-1]
   XCODE_VERSION_CACHE = (version, build)