annotator_commands: allow running different annotated scripts

scripts/master/factory/commands.py

 # 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.
 
 """Set of utilities to add commands to a buildbot factory (BuildFactory).
 
 All the utility functions to add steps to a build factory here are not
 project-specific. See the other *_commands.py for project-specific commands.
 """
 
@@ skipping 331 matching lines @@
 
     self._update_nacl_sdk_tool = self.PathJoin(self._script_dir,
                                                'update_nacl_sdk.py')
 
     # chrome_staging directory, relative to the build directory.
     self._staging_dir = self.PathJoin('..', 'chrome_staging')
 
     # scripts in scripts/slave
     self._runbuild = self.PathJoin(self._script_dir, 'runbuild.py')
 
+  @property
+  def python(self):
+    return self._python
+
+  @property
+  def script_dir(self):
+    return self._script_dir
+
   # Util methods.
   def GetExecutableName(self, executable):
     """The executable name must be executable plus '.exe' on Windows, or else
     just the test name."""
     if self._target_platform == 'win32':
       return executable + '.exe'
     return executable
 
   def PathJoin(self, *args):
     if self._target_platform == 'win32':
@@ skipping 999 matching lines @@
 
   def commandComplete(self, cmd):
     out = cmd.logs['stdio'].getText()
     build_properties = re.findall('BUILD_PROPERTY ([^=]*)=(.*)', out)
     for propname, value in build_properties:
       # findall can return strings containing CR characters, remove with strip.
       self.build.setProperty(propname, value.strip(), 'Step')
 
   def getText(self, cmd, results):
     return self.describe(True) + self.messages