Revert revisions 28764, 28756, 28754, 28751

client/tools/buildbot_annotated_steps.py

 #!/usr/bin/python
 # 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.
 
 # 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.
 
 """Dart client buildbot steps
 
 Compiles dart client apps with dartc, and run the client tests both in headless
 chromium and headless dartium.
 """
 
 import imp
 import os
-import platform
 import re
 import socket
 import subprocess
 import sys
 
 BUILDER_NAME = 'BUILDBOT_BUILDERNAME'
 BUILDER_CLOBBER = 'BUILDBOT_CLOBBER'
 REVISION = 'BUILDBOT_REVISION'
 
 # latest dartium location
@@ skipping 99 matching lines @@
     # environment variables available.
     has_shell = True
   return subprocess.call([sys.executable,
       os.path.join('tools', 'bots', target + '.py')],
       env=environment, shell=has_shell)
 
 def FixJavaHome():
   buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
   if buildbot_javahome:
     current_pwd = os.getenv('PWD')
-    if platform.system() != 'Windows':
-      java_home = '/usr/lib/jvm/java-6-sun' # Hackety-hack. Please remove!
-    else:
-      java_home = os.path.join(current_pwd, buildbot_javahome)
+    java_home = os.path.join(current_pwd, buildbot_javahome)
     java_bin = os.path.join(java_home, 'bin')
     os.environ['JAVA_HOME'] = java_home
     os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])
 
     print 'Setting java home to ', java_home
     sys.stdout.flush()
 
 def ClobberBuilder():
   """ Clobber the builder before we do the build.
   """
@@ skipping 56 matching lines @@
     status = ProcessBot(name, 'compiler')
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())