Add setup of JAVA_HOME to the annotated steps script. The buildbot will pass the relative path to t…

client/tools/buildbot_annotated_steps.py

 # Copyright (c) 2011, 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.
 
 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
@@ skipping 111 matching lines @@
   print 'ProcessCompiler'
   has_shell=False
   if 'windows' in name:
     # In Windows we need to run in the shell, so that we have all the
     # environment variables available.
     has_shell=True
   return subprocess.call([sys.executable,
       os.path.join('utils', 'compiler', 'buildbot.py')],
       env=os.environ, shell=has_shell)
 
+def FixJavaHome():
+  buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
+  if buildbot_javahome:
+    current_pwd = os.getenv('PWD')
+    java_home = os.path.join(current_pwd, buildbot_javahome)
+    os.environ['JAVA_HOME'] = java_home
+    print 'Setting java home to'
+    print java_home
+
+
 def main():
   print 'main'
   if len(sys.argv) == 0:
     print 'Script pathname not known, giving up.'
     return 1
 
   scriptdir = os.path.dirname(sys.argv[0])
   # Get at the top-level directory. This script is in client/tools
   os.chdir(os.path.abspath(os.path.join(scriptdir, os.pardir, os.pardir)))
 
   #TODO(sigmund): remove this indirection once we update our bots
   (name, version) = GetBuildInfo()
+  # The buildbot will set a BUILDBOT_JAVA_HOME relative to the dart
+  # root directory, set JAVA_HOME based on that.
+  FixJavaHome()
   if name.startswith('dart-editor'):
     status = ProcessTools('release', name, version)
   else:
     status = ProcessCompiler(name)
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())