languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 15:01:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get Windows Editor buildbot running with correct java again.

Browse source 
BUG=
R=danrubel@google.com

Review URL: https://codereview.chromium.org//27443003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@28764 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
efortuna@google.com 2013-10-16 23:53:26 +00:00
parent c7211b51c4
commit f106bea99c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/tools/buildbot_annotated_steps.py
View file

@ -15,6 +15,7 @@ chromium and headless dartium.
import imp
import os
import platform
import re
import socket
import subprocess
@ -134,7 +135,10 @@ def FixJavaHome():
buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
if buildbot_javahome:
current_pwd = os.getenv('PWD')
java_home = '/usr/lib/jvm/java-6-sun'#os.path.join(current_pwd, buildbot_javahome)
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_bin = os.path.join(java_home, 'bin')
os.environ['JAVA_HOME'] = java_home
os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])