Fix build/config/mac/gen_plist.py.

build/config/mac/gen_plist.py

 # 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.
 
 import argparse
 import plistlib
 import os
 import re
 import subprocess
 import sys
 import tempfile
 import shlex
 
 
 # Xcode substitutes variables like ${PRODUCT_NAME} when compiling Info.plist.
 # It also supports supports modifiers like :identifier or :rfc1034identifier.
 # SUBST_RE matches a variable substitution pattern with an optional modifier,
 # while IDENT_RE matches all characters that are not valid in an "identifier"
 # value (used when applying the modifier).
 SUBST_RE = re.compile(r'\$\{(?P<id>[^}]*?)(?P<modifier>:[^}]*)?\}')
-IDENT_RE = re.compile(r'[/\s]')
+IDENT_RE = re.compile(r'[_/\s]')
 
 
 class ArgumentParser(argparse.ArgumentParser):
   """Subclass of argparse.ArgumentParser to work with GN response files.
 
   GN response file writes all the arguments on a single line and assumes
   that the python script uses shlext.split() to extract them. Since the
   default ArgumentParser expects a single argument per line, we need to
   provide a subclass to have the correct support for @{{response_file_name}}.
   """
@@ skipping 34 matching lines @@
     A new string with all variables references ${VARIABLES} replaced by their
     value in |substitutions| or None if any of the variable has no substitution.
   """
   result = value
   for match in reversed(list(SUBST_RE.finditer(value))):
     variable = match.group('id')
     if variable not in substitutions:
       return None
     # Some values need to be identifier and thus the variables references may
     # contains :modifier attributes to indicate how they should be converted
-    # to identifiers ("identifier" replaces all invalid characters by '-' and
-    # "rfc1034identifier" replaces them by "_" to make valid URI too).
+    # to identifiers ("identifier" replaces all invalid characters by '_' and
+    # "rfc1034identifier" replaces them by "-" to make valid URI too).
     modifier = match.group('modifier')
-    if modifier == 'identifier':
+    if modifier == ':identifier':
+      interpolated = IDENT_RE.sub('_', substitutions[variable])
+    elif modifier == ':rfc1034identifier':
       interpolated = IDENT_RE.sub('-', substitutions[variable])
-    elif modifier == 'rfc1034identifier':
-      interpolated = IDENT_RE.sub('_', substitutions[variable])
     else:
       interpolated = substitutions[variable]
     result = result[:match.start()] + interpolated + result[match.end():]
   return result
 
 
 def InterpolateValue(value, substitutions):
   """Interpolates variable references into |value| using |substitutions|.
 
   Inputs:
@@ skipping 107 matching lines @@
     substitutions[key] = value
   data = {}
   for filename in args.path:
     data = MergePList(data, LoadPList(filename))
   data = Interpolate(data, substitutions)
   SavePList(args.output, args.format, data)
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())