Allow using the same checkout to build both iOS and macOS.

build/mac_toolchain.py

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 If should_use_hermetic_xcode.py emits "1", and the current toolchain is out of
 date:
   * Downloads the hermetic mac toolchain
     * Requires gsutil to be configured.
@@ skipping 22 matching lines @@
 IOS_TOOLCHAIN_VERSION = '%s-%s' % (IOS_TOOLCHAIN_VERSION,
                                    IOS_TOOLCHAIN_SUB_REVISION)
 
 # Absolute path to src/ directory.
 REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # Absolute path to a file with gclient solutions.
 GCLIENT_CONFIG = os.path.join(os.path.dirname(REPO_ROOT), '.gclient')
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
-TOOLCHAIN_BUILD_DIR = os.path.join(BASE_DIR, 'mac_files', 'Xcode.app')
-STAMP_FILE = os.path.join(BASE_DIR, 'mac_files', 'toolchain_build_revision')
+TOOLCHAIN_BUILD_DIR = os.path.join(BASE_DIR, '%s_files', 'Xcode.app')
+STAMP_FILE = os.path.join(BASE_DIR, '%s_files', 'toolchain_build_revision')
 TOOLCHAIN_URL = 'gs://chrome-mac-sdk/'
 
-def IsIOSPlatform():
+def GetPlatforms():
+  default_target_os = ["mac"]
   try:
     env = {}
     execfile(GCLIENT_CONFIG, env, env)
-    if 'ios' in env.get('target_os', []):
-      return True
+    return env.get('target_os', default_target_os)
   except:
     pass
-  return False
+  return default_target_os
 
 
-def ReadStampFile():
+def ReadStampFile(target_os):
   """Return the contents of the stamp file, or '' if it doesn't exist."""
   try:
-    with open(STAMP_FILE, 'r') as f:
+    with open(STAMP_FILE % target_os, 'r') as f:
       return f.read().rstrip()
   except IOError:
     return ''
 
 
-def WriteStampFile(s):
+def WriteStampFile(target_os, s):
   """Write s to the stamp file."""
-  EnsureDirExists(os.path.dirname(STAMP_FILE))
-  with open(STAMP_FILE, 'w') as f:
+  EnsureDirExists(os.path.dirname(STAMP_FILE % target_os))
+  with open(STAMP_FILE % target_os, 'w') as f:
     f.write(s)
     f.write('\n')
 
 
 def EnsureDirExists(path):
   if not os.path.exists(path):
     os.makedirs(path)
 
 
 def DownloadAndUnpack(url, output_dir):
@@ skipping 24 matching lines @@
   """Loads Plist at |path| and returns it as a dictionary."""
   fd, name = tempfile.mkstemp()
   try:
     subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path])
     with os.fdopen(fd, 'r') as f:
       return plistlib.readPlist(f)
   finally:
     os.unlink(name)
 
 
-def AcceptLicense():
+def AcceptLicense(target_os):
   """Use xcodebuild to accept new toolchain license if necessary.  Don't accept
   the license if a newer license has already been accepted. This only works if
   xcodebuild and xcode-select are passwordless in sudoers."""
 
   # Check old license
   try:
     target_license_plist_path = \
-        os.path.join(TOOLCHAIN_BUILD_DIR,
+        os.path.join(TOOLCHAIN_BUILD_DIR % target_os,
                      *['Contents','Resources','LicenseInfo.plist'])
     target_license_plist = LoadPlist(target_license_plist_path)
     build_type = target_license_plist['licenseType']
     build_version = target_license_plist['licenseID']
 
     accepted_license_plist = LoadPlist(
         '/Library/Preferences/com.apple.dt.Xcode.plist')
     agreed_to_key = 'IDELast%sLicenseAgreedTo' % build_type
     last_license_agreed_to = accepted_license_plist[agreed_to_key]
 
     # Historically all Xcode build numbers have been in the format of AANNNN, so
     # a simple string compare works.  If Xcode's build numbers change this may
     # need a more complex compare.
     if build_version <= last_license_agreed_to:
       # Don't accept the license of older toolchain builds, this will break the
       # license of newer builds.
       return
   except (subprocess.CalledProcessError, KeyError):
     # If there's never been a license of type |build_type| accepted,
     # |target_license_plist_path| or |agreed_to_key| may not exist.
     pass
 
   print "Accepting license."
   old_path = subprocess.Popen(['/usr/bin/xcode-select', '-p'],
                                stdout=subprocess.PIPE).communicate()[0].strip()
   try:
-    build_dir = os.path.join(TOOLCHAIN_BUILD_DIR, 'Contents/Developer')
+    build_dir = os.path.join(
+        TOOLCHAIN_BUILD_DIR % target_os, 'Contents/Developer')
     subprocess.check_call(['sudo', '/usr/bin/xcode-select', '-s', build_dir])
     subprocess.check_call(['sudo', '/usr/bin/xcodebuild', '-license', 'accept'])
   finally:
     subprocess.check_call(['sudo', '/usr/bin/xcode-select', '-s', old_path])
 
 
-def _UseHermeticToolchain():
+def _UseHermeticToolchain(target_os):
   current_dir = os.path.dirname(os.path.realpath(__file__))
   script_path = os.path.join(current_dir, 'mac/should_use_hermetic_xcode.py')
-  target_os = 'ios' if IsIOSPlatform() else 'mac'
   proc = subprocess.Popen([script_path, target_os], stdout=subprocess.PIPE)
   return '1' in proc.stdout.readline()
 
 
 def RequestGsAuthentication():
   """Requests that the user authenticate to be able to access gs://.
   """
   print 'Access to ' + TOOLCHAIN_URL + ' not configured.'
   print '-----------------------------------------------------------------'
   print
   print 'You appear to be a Googler.'
   print
   print 'I\'m sorry for the hassle, but you need to do a one-time manual'
   print 'authentication. Please run:'
   print
   print '    download_from_google_storage --config'
   print
   print 'and follow the instructions.'
   print
   print 'NOTE 1: Use your google.com credentials, not chromium.org.'
   print 'NOTE 2: Enter 0 when asked for a "project-id".'
   print
   print '-----------------------------------------------------------------'
   print
   sys.stdout.flush()
   sys.exit(1)
 
 
-def main():
-  if sys.platform != 'darwin':
-    return 0
-
-  if not _UseHermeticToolchain():
-    print 'Using local toolchain.'
-    return 0
-
-  if IsIOSPlatform():
-    default_version = IOS_TOOLCHAIN_VERSION
-    toolchain_filename = 'ios-toolchain-%s.tgz'
-  else:
-    default_version = MAC_TOOLCHAIN_VERSION
-    toolchain_filename = 'toolchain-%s.tgz'
-
+def DownloadHermeticBuild(target_os, default_version, toolchain_filename):
   toolchain_version = os.environ.get('MAC_TOOLCHAIN_REVISION',
                                       default_version)
 
-  if ReadStampFile() == toolchain_version:
+  if ReadStampFile(target_os) == toolchain_version:
     print 'Toolchain (%s) is already up to date.' % toolchain_version
-    AcceptLicense()
+    AcceptLicense(target_os)
     return 0
 
   if not CanAccessToolchainBucket():
     RequestGsAuthentication()
     return 1
 
   # Reset the stamp file in case the build is unsuccessful.
-  WriteStampFile('')
+  WriteStampFile(target_os, '')
 
   toolchain_file = '%s.tgz' % toolchain_version
   toolchain_full_url = TOOLCHAIN_URL + toolchain_file
 
   print 'Updating toolchain to %s...' % toolchain_version
   try:
     toolchain_file = toolchain_filename % toolchain_version
     toolchain_full_url = TOOLCHAIN_URL + toolchain_file
-    DownloadAndUnpack(toolchain_full_url, TOOLCHAIN_BUILD_DIR)
-    AcceptLicense()
+    DownloadAndUnpack(toolchain_full_url, TOOLCHAIN_BUILD_DIR % target_os)
+    AcceptLicense(target_os)
 
     print 'Toolchain %s unpacked.' % toolchain_version
-    WriteStampFile(toolchain_version)
+    WriteStampFile(target_os, toolchain_version)
     return 0
   except Exception as e:
     print 'Failed to download toolchain %s.' % toolchain_file
     print 'Exception %s' % e
     print 'Exiting.'
     return 1
 
+
+def main():
+  if sys.platform != 'darwin':
+    return 0
+
+  for target_os in GetPlatforms():
+    if target_os == "ios":
+      default_version = IOS_TOOLCHAIN_VERSION
+      toolchain_filename = 'ios-toolchain-%s.tgz'
+    else:
+      default_version = MAC_TOOLCHAIN_VERSION
+      toolchain_filename = 'toolchain-%s.tgz'
+
+    if not _UseHermeticToolchain(target_os):
+      print 'Using local toolchain for %s.' % target_os

[justincohen, 2017/01/11 14:25:22]

no return value here

[sdefresne, 2017/01/11 14:34:15]

Yes, we want to continue iterating on the next target_os returned by
GetPlatforms(). I've moved the test inside DownloadHermeticBuild() to make it
clearer that this is not a condition that should stop the full script, just stop
downloading those particular files.

+    elif DownloadHermeticBuild(target_os, default_version, toolchain_filename):
+      return 1

[justincohen, 2017/01/11 14:25:22]

don't you want to return the result of DownloadHermeticBuild?

[sdefresne, 2017/01/11 14:34:15]

Done.

+
+
 if __name__ == '__main__':
   sys.exit(main())