Handle more types of gypis in gypi_to_gn.

build/gypi_to_gn.py

 # Copyright 2014 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.
 
 """Converts a given gypi file to a python scope and writes the result to stdout.
 
 It is assumed that the file contains a toplevel dictionary, and this script
 will return that dictionary as a GN "scope" (see example below). This script
 does not know anything about GYP and it will not expand variables or execute
 conditions.
@@ skipping 67 matching lines @@
   try:
     file_data = eval(file_string, {'__builtins__': None}, None)
   except SyntaxError, e:
     e.filename = path
     raise
   except Exception, e:
     raise Exception("Unexpected error while reading %s: %s" % (path, str(e)))
 
   assert isinstance(file_data, dict), "%s does not eval to a dictionary" % path
 
+  # Flatten any variables to the top level.
+  if 'variables' in file_data:
+    file_data.update(file_data['variables'])
+    del file_data['variables']
+
   # Strip any conditions.
   if 'conditions' in file_data:
     del file_data['conditions']
   if 'target_conditions' in file_data:
     del file_data['target_conditions']
 
-  # Flatten any varaiables to the top level.
-  if 'variables' in file_data:
-    file_data.update(file_data['variables'])
-    del file_data['variables']
-
-  # If the contents of the root is a dictionary with exactly one kee
-  # "variables", promote the contents of that to the top level. Some .gypi
-  # files contain this and some don't depending on how they expect to be
-  # embedded in a .gyp file. We don't actually care either way so collapse it
-  # away.
-  if len(file_data) == 1 and 'variables' in file_data:
-    return file_data['variables']
-
   return file_data
 
 
 def ReplaceSubstrings(values, search_for, replace_with):
   """Recursively replaces substrings in a value.
 
   Replaces all substrings of the "search_for" with "repace_with" for all
   strings occurring in "values". This is done by recursively iterating into
   lists as well as the keys and values of dictionaries."""
   if isinstance(values, str):
@@ skipping 27 matching lines @@
   if options.replace:
     # Do replacements for all specified patterns.
     for replace in options.replace:
       split = replace.split('=')
       # Allow "foo=" to replace with nothing.
       if len(split) == 1:
         split.append('')
       assert len(split) == 2, "Replacement must be of the form 'key=value'."
       data = ReplaceSubstrings(data, split[0], split[1])
 
+  # Sometimes .gypi files use the GYP syntax with percents at the end of the
+  # variable name (to indicate not to overwrite a previously-defined value):
+  #   'foo%': 'bar',
+  # Convert these to regular variables.
+  for key in data:
+    if len(key) > 1 and key[len(key) - 1] == '%':
+      data[key[:-1]] = data[key]
+      del data[key]
+
   print gn_helpers.ToGNString(data)
 
 if __name__ == '__main__':
   try:
     main()
   except Exception, e:
     print str(e)
     sys.exit(1)