Move CheckedInSdkPath helpers to utils

tools/utils.py

 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # This file contains a set of utilities functions used by other Python-based
 # scripts.
 
 import commands
 import datetime
 import json
 import os
 import platform
 import re
 import shutil
 import subprocess
 import tempfile
 import sys
 
+SCRIPT_DIR = os.path.dirname(sys.argv[0])

[ricow1, 2015/09/14 05:46:41]

we don't normally do this, see comment in function below

[Cutch, 2015/09/14 14:05:43]

Done.

+DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..'))
+
 class Version(object):
   def __init__(self, channel, major, minor, patch, prerelease,
                prerelease_patch):
     self.channel = channel
     self.major = major
     self.minor = minor
     self.patch = patch
     self.prerelease = prerelease
     self.prerelease_patch = prerelease_patch
 
@@ skipping 555 matching lines @@
       return os.path.join(dart_binary_prefix, system, 'dart-mips')
     else:
       return os.path.join(dart_binary_prefix, system, 'dart')
 
 
 def DartSdkBinary():
   tools_dir = os.path.dirname(os.path.realpath(__file__))
   dart_binary_prefix = os.path.join(tools_dir, '..', 'sdk' , 'bin')
   return os.path.join(dart_binary_prefix, 'dart')
 
+
+def CheckedInSdkPath():
+  osdict = {'Darwin':'mac', 'Linux':'linux', 'Windows':'win'}

[ricow1, 2015/09/14 05:46:41]

please add a comment here:
# We don't use the normal macos/linux/win32 here. These are the
# prefixes that automatic platform checkouts in 
# download_from_google_storage is done

[Cutch, 2015/09/14 14:05:43]

Done.

+  system = platform.system()
+  try:
+    osname = osdict[system]
+  except KeyError:
+    print >>sys.stderr, ('WARNING: platform "%s" not supported') % (system)
+    return None;
+  return os.path.join(DART_ROOT,

[ricow1, 2015/09/14 05:46:41]

This seems to work better in general
tools_dir = os.path.dirname(os.path.realpath(__file__))
return os.path.join(tools_dir, 'sdks', osname, 'dart-sdk'_

[Cutch, 2015/09/14 14:05:43]

Done.

+                      'tools',
+                      'sdks',
+                      osname,
+                      'dart-sdk')
+
+
+def CheckedInPubPath():
+  executable_name = 'pub'
+  if platform.system() == 'Windows':
+    executable_name = 'pub.bat'
+  return os.path.join(CheckedInSdkPath(), 'bin', executable_name)
+
+
 class TempDir(object):
   def __init__(self, prefix=''):
     self._temp_dir = None
     self._prefix = prefix
 
   def __enter__(self):
     self._temp_dir = tempfile.mkdtemp(self._prefix)
     return self._temp_dir
 
   def __exit__(self, *_):
     shutil.rmtree(self._temp_dir, ignore_errors=True)
 
 class ChangedWorkingDirectory(object):
   def __init__(self, working_directory):
     self._working_directory = working_directory
 
   def __enter__(self):
     self._old_cwd = os.getcwd()
     print "Enter directory = ", self._working_directory
     os.chdir(self._working_directory)
 
   def __exit__(self, *_):
     print "Enter directory = ", self._old_cwd
     os.chdir(self._old_cwd)
 
 
 if __name__ == "__main__":
   import sys
   Main()