Move GYP_DEFINES parsing to Python for GN

build/gyp_chromium

 #!/usr/bin/env python
 
 # Copyright (c) 2012 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.
 
 # This script is wrapper for Chromium that adds some support for how GYP
 # is invoked by Chromium beyond what can be done in the gclient hooks.
 
 import glob
@@ skipping 36 matching lines @@
 if sys.platform == 'win32':
   try:
     sys.path.insert(0, os.path.join(chrome_src, 'third_party', 'psyco_win32'))
     import psyco
   except:
     psyco = None
 else:
   psyco = None
 
 
-def additional_include_files(args=[]):
+def GetSupplementalFiles():
+  """Returns a list of the supplemental files that are included in all GYP

[bradn, 2013/11/19 17:45:58]

FWIW These are usually meant to fix on one line.

+  sources."""
+  return glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi'))
+
+
+def GetVarsStringForGN(supplemental_files):
+  vars_dict = {}
+
+  for supplement in supplemental_files:
+    with open(supplement, 'r') as f:
+      try:
+        file_data = eval(f.read(), {'__builtins__': None}, None)
+      except SyntaxError, e:
+        e.filename = os.path.abspath(supplement)
+        raise
+      variables = file_data.get('variables')
+      for v in variables:
+        vars_dict[v] = '"' + variables[v] + '"'
+
+  env_string = os.environ.get('GYP_DEFINES', [])
+  items = shlex.split(env_string)
+  for item in items:
+    tokens = item.split('=', 1)
+    if len(tokens) == 2:
+      vars_dict[tokens[0]] = '"' + tokens[1] + '"'
+    else:
+      # No value supplied, treat it as a boolean and set it.
+      vars_dict[tokens[0]] = 'true'
+
+  vars_string = ''
+  for v in vars_dict:
+    vars_string = vars_string + v + '=' + vars_dict[v] + ' '
+  return vars_string.strip()  # Remove trailing space.
+
+
+def additional_include_files(supplemental_files, args=[]):
   """
-  Returns a list of additional (.gypi) files to include, without
-  duplicating ones that are already specified on the command line.
+  Returns a list of additional (.gypi) files to include, without duplicating
+  ones that are already specified on the command line. The list of supplemental
+  include files is passed in as an argument.
   """
   # Determine the include files specified on the command line.
   # This doesn't cover all the different option formats you can use,
   # but it's mainly intended to avoid duplicating flags on the automatic
   # makefile regeneration which only uses this format.
   specified_includes = set()
   for arg in args:
     if arg.startswith('-I') and len(arg) > 2:
       specified_includes.add(os.path.realpath(arg[2:]))
 
   result = []
   def AddInclude(path):
     if os.path.realpath(path) not in specified_includes:
       result.append(path)
 
   # Always include common.gypi.
   AddInclude(os.path.join(script_dir, 'common.gypi'))
 
   # Optionally add supplemental .gypi files if present.
-  supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi'))
-  for supplement in supplements:
+  for supplement in supplemental_files:
     AddInclude(supplement)
 
   return result
 
 
-def RunGN():
+def RunGN(supplemental_includes):
   """Runs GN, returning True if it succeeded, printing an error and returning
   false if not."""
+
   # The binaries in platform-specific subdirectories in src/tools/gn/bin.
   gnpath = SRC_DIR + '/tools/gn/bin/'
   if sys.platform == 'win32':
     gnpath += 'win/gn.exe'
   elif sys.platform.startswith('linux'):
     gnpath += 'linux/gn'
   elif sys.platform == 'darwin':
     gnpath += 'mac/gn'
   else:
     print 'Unknown platform for GN: ', sys.platform
     return False
 
   print 'Generating gyp files from GN...'
-  print 'platform = ', sys.platform
-  print 'binary = ', gnpath
+  gyp_vars = GetVarsStringForGN(supplemental_includes)
 
   # Need to pass both the source root (the bots don't run this command from
   # within the source tree) as well as set the is_gyp value so the BUILD files
   # to know they're being run under GYP.
-  args = [gnpath, 'gyp', '-q', '--root=' + chrome_src, '--args=is_gyp=true']
+  args = [gnpath, 'gyp', '-q',
+          '--root=' + chrome_src,
+          '--args=is_gyp=true',
+          '--gyp_vars=' + gyp_vars + '']
   return subprocess.call(args) == 0
 
 
 if __name__ == '__main__':
   args = sys.argv[1:]
 
   # Use the Psyco JIT if available.
   if psyco:
     psyco.profile()
     print "Enabled Psyco JIT."
 
-  if not RunGN():
-    sys.exit(1)
-
   # Fall back on hermetic python if we happen to get run under cygwin.
   # TODO(bradnelson): take this out once this issue is fixed:
   #    http://code.google.com/p/gyp/issues/detail?id=177
   if sys.platform == 'cygwin':
     python_dir = os.path.join(chrome_src, 'third_party', 'python_26')
     env = os.environ.copy()
     env['PATH'] = python_dir + os.pathsep + env.get('PATH', '')
     p = subprocess.Popen(
        [os.path.join(python_dir, 'python.exe')] + sys.argv,
        env=env, shell=False)
@@ skipping 14 matching lines @@
   # assuming 'all.gyp' from the same directory as the script.
   if not gyp_file_specified:
     gyp_file = os.environ.get('CHROMIUM_GYP_FILE')
     if gyp_file:
       # Note that CHROMIUM_GYP_FILE values can't have backslashes as
       # path separators even on Windows due to the use of shlex.split().
       args.extend(shlex.split(gyp_file))
     else:
       args.append(os.path.join(script_dir, 'all.gyp'))
 
-  args.extend(['-I' + i for i in additional_include_files(args)])
+  supplemental_includes = GetSupplementalFiles()
+
+  if not RunGN(supplemental_includes):
+    sys.exit(1)
+
+  args.extend(
+      ['-I' + i for i in additional_include_files(supplemental_includes, args)])
 
   # There shouldn't be a circular dependency relationship between .gyp files,
   # but in Chromium's .gyp files, on non-Mac platforms, circular relationships
   # currently exist.  The check for circular dependencies is currently
   # bypassed on other platforms, but is left enabled on the Mac, where a
   # violation of the rule causes Xcode to misbehave badly.
   # TODO(mark): Find and kill remaining circular dependencies, and remove this
   # option.  http://crbug.com/35878.
   # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the
   # list.
@@ skipping 15 matching lines @@
   # to enfore syntax checking.
   syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
   if syntax_check and int(syntax_check):
     args.append('--check')
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   # Off we go...
   sys.exit(gyp.main(args))