[NaCl SDK] Fix "make debug" and "make run" on Mac.

native_client_sdk/src/tools/getos.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.
 
 """Determine OS and various other system properties.
 
 Determine the name of the platform used and other system properties such as
 the location of Chrome.  This is used, for example, to determine the correct
 Toolchain to invoke.
 """
 
 import optparse
 import os
 import re
 import subprocess
 import sys
 
 import oshelpers
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-CHROME_EXE_BASENAME = 'google-chrome'
+CHROME_EXE_BASENAME = {
+  'win': 'chrome.exe',
+  'mac': 'Google Chrome',
+  'linux': 'google-chrome',
+}
+CHROME_DEFAULT_PATH = {
+  'win': r'c:\Program Files (x86)\Google\Chrome\Application\chrome.exe',
+  'mac': '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+  'linux': '/usr/bin/google-chrome',
+}

[Sam Clegg, 2013/12/02 22:46:50]

Isn't this information duplicated here.

Also, I'm pretty sure that / is find on win32 too these days.

[binji, 2013/12/03 00:33:59]

Done.
Everywhere? We don't know where this path is being used, so better to be safe
and use \ I think.

 
 
 if sys.version_info < (2, 6, 0):
   sys.stderr.write("python 2.6 or later is required run this script\n")
   sys.exit(1)
 
 
 class Error(Exception):
   pass
 
@@ skipping 61 matching lines @@
       pobj = subprocess.Popen(['uname', '-m'], stdout= subprocess.PIPE)
       arch = pobj.communicate()[0]
       arch = arch.split()[0]
       if arch.startswith('arm'):
         arch = 'arm'
     except Exception:
       arch = None
   return arch
 
 
-def GetChromePath():
+def GetChromePath(platform):
+  # If CHROME_PATH is defined and exists, use that.
   chrome_path = os.environ.get('CHROME_PATH')
   if chrome_path:
     if not os.path.exists(chrome_path):
       raise Error('Invalid CHROME_PATH: %s' % chrome_path)
-  else:
-    chrome_path = oshelpers.FindExeInPath(CHROME_EXE_BASENAME)
-    if not chrome_path:
-      raise Error('CHROME_PATH is undefined, and %s not found in PATH.' %
-                  CHROME_EXE_BASENAME)
+    return os.path.realpath(chrome_path)
 
-  return os.path.realpath(chrome_path)
+  # Otherwise look in the PATH environment variable.
+  basename = CHROME_EXE_BASENAME[platform]
+  chrome_path = oshelpers.FindExeInPath(basename)
+  if chrome_path:
+    return os.path.realpath(chrome_path)
+
+  # Finally, try the default paths to Chrome.
+  chrome_path = CHROME_DEFAULT_PATH[platform]
+  if os.path.exists(chrome_path):
+    return os.path.realpath(chrome_path)
+
+  raise Error('CHROME_PATH is undefined, and %s not found in PATH, nor %s.' % (
+              basename, chrome_path))
 
 
 def GetNaClArch(platform):
   if platform == 'win':
     # On windows the nacl arch always matches to system arch
     return GetSystemArch(platform)
   elif platform == 'mac':
     # On Mac the nacl arch is currently always 32-bit.
     return 'x86_32'
 
   # On linux the nacl arch matches to chrome arch, so we inspect the chrome
   # binary using objdump
-  chrome_path = GetChromePath()
+  chrome_path = GetChromePath(platform)
 
   # If CHROME_PATH is set to point to google-chrome or google-chrome
   # was found in the PATH and we are running on UNIX then google-chrome
   # is a bash script that points to 'chrome' in the same folder.
   if os.path.basename(chrome_path) == 'google-chrome':
     chrome_path = os.path.join(os.path.dirname(chrome_path), 'chrome')
 
   try:
     pobj = subprocess.Popen(['objdump', '-f', chrome_path],
                             stdout=subprocess.PIPE,
@@ skipping 92 matching lines @@
 
   if not args:
     print platform
     return 0
 
   if options.arch:
     out = GetSystemArch(platform)
   elif options.nacl_arch:
     out = GetNaClArch(platform)
   elif options.chrome:
-    out = GetChromePath()
+    out = GetChromePath(platform)
   elif options.helper:
     out = GetHelperPath(platform)
   elif options.irtbin:
     out = GetIrtBinPath(platform)
   elif options.loader:
     out = GetLoaderPath(platform)
   elif options.sdk_version:
     out = GetSDKVersion()[0]
   elif options.sdk_revision:
     out = GetSDKVersion()[1]
@@ skipping 10 matching lines @@
     print out
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)