Rework build/mac/tweak_info_plist.py to not rely on environment variables.

build/mac/tweak_info_plist.py

 #!/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.
 
 #
 # Xcode supports build variable substitutions and CPP; sadly, that doesn't work
 # because:
 #
 # 1. Xcode wants to do the Info.plist work before it runs any build phases,
 #    this means if we were to generate a .h file for INFOPLIST_PREFIX_HEADER
 #    we'd have to put it in another target so it runs in time.
 # 2. Xcode also doesn't check to see if the header being used as a prefix for
 #    the Info.plist has changed.  So even if we updated it, it's only looking
 #    at the modtime of the info.plist to see if that's changed.
 #
 # So, we work around all of this by making a script build phase that will run
 # during the app build, and simply update the info.plist in place.  This way
 # by the time the app target is done, the info.plist is correct.
 #
 
 import optparse
 import os
-from os import environ as env
 import plistlib
 import re
 import subprocess
 import sys
 import tempfile
 
 TOP = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 def _GetOutput(args):
@@ skipping 159 matching lines @@
       'KSUpdateURL')
 
   tag_keys = []
   for tag_suffix in _TagSuffixes():
     tag_keys.append('KSChannelID' + tag_suffix)
   _RemoveKeys(plist, *tag_keys)
 
 
 def Main(argv):
   parser = optparse.OptionParser('%prog [options]')
+  parser.add_option('--plist', dest='plist_path', action='store',
+      type='string', default=None, help='The path of the plist to tweak.')
   parser.add_option('--breakpad', dest='use_breakpad', action='store',
       type='int', default=False, help='Enable Breakpad [1 or 0]')
   parser.add_option('--breakpad_uploads', dest='breakpad_uploads',
       action='store', type='int', default=False,
       help='Enable Breakpad\'s uploading of crash dumps [1 or 0]')
   parser.add_option('--keystone', dest='use_keystone', action='store',
       type='int', default=False, help='Enable Keystone [1 or 0]')
   parser.add_option('--scm', dest='add_scm_info', action='store', type='int',
       default=True, help='Add SCM metadata [1 or 0]')
   parser.add_option('--branding', dest='branding', action='store',
       type='string', default=None, help='The branding of the binary')
   parser.add_option('--bundle_id', dest='bundle_identifier',
       action='store', type='string', default=None,
       help='The bundle id of the binary')
   parser.add_option('--version', dest='version', action='store', type='string',
       default=None, help='The version string [major.minor.build.patch]')
   (options, args) = parser.parse_args(argv)
 
   if len(args) > 0:
     print >>sys.stderr, parser.get_usage()
     return 1
 
+  if not options.plist_path:
+    print >>sys.stderr, 'No --plist specified.'
+    return 1
+
   # Read the plist into its parsed format.
-  DEST_INFO_PLIST = os.path.join(env['TARGET_BUILD_DIR'], env['INFOPLIST_PATH'])
-  plist = plistlib.readPlist(DEST_INFO_PLIST)
+  plist = plistlib.readPlist(options.plist_path)
 
   # Insert the product version.
   if not _AddVersionKeys(plist, version=options.version):
     return 2
 
   # Add Breakpad if configured to do so.
   if options.use_breakpad:
     if options.branding is None:
       print >>sys.stderr, 'Use of Breakpad requires branding.'
       return 1
     _AddBreakpadKeys(plist, options.branding)
     if options.breakpad_uploads:
       plist['BreakpadURL'] = 'https://clients2.google.com/cr/report'
     else:
       # This allows crash dumping to a file without uploading the
       # dump, for testing purposes.  Breakpad does not recognise
       # "none" as a special value, but this does stop crash dump
       # uploading from happening.  We need to specify something
       # because if "BreakpadURL" is not present, Breakpad will not
       # register its crash handler and no crash dumping will occur.
       plist['BreakpadURL'] = 'none'
   else:
     _RemoveBreakpadKeys(plist)
 
-  # Only add Keystone in Release builds.
-  if options.use_keystone and env['CONFIGURATION'] == 'Release':
+  # Add Keystone if configured to do so.
+  if options.use_keystone:
     if options.bundle_identifier is None:
       print >>sys.stderr, 'Use of Keystone requires the bundle id.'
       return 1
     _AddKeystoneKeys(plist, options.bundle_identifier)
   else:
     _RemoveKeystoneKeys(plist)
 
   # Adds or removes any SCM keys.
   if not _DoSCMKeys(plist, options.add_scm_info):
     return 3
 
   # Now that all keys have been mutated, rewrite the file.
   temp_info_plist = tempfile.NamedTemporaryFile()
   plistlib.writePlist(plist, temp_info_plist.name)
 
   # Info.plist will work perfectly well in any plist format, but traditionally
   # applications use xml1 for this, so convert it to ensure that it's valid.
-  proc = subprocess.Popen(['plutil', '-convert', 'xml1', '-o', DEST_INFO_PLIST,
+  proc = subprocess.Popen(['plutil', '-convert', 'xml1',
+                           '-o', options.plist_path,
                            temp_info_plist.name])
   proc.wait()
   return proc.returncode
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))