mirror of
https://github.com/dart-lang/sdk
synced 2024-09-16 03:17:55 +00:00
Get Windows Editor buildbot running with correct java again.
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:
parent
c7211b51c4
commit
f106bea99c
|
@ -15,6 +15,7 @@ chromium and headless dartium.
|
||||||
|
|
||||||
import imp
|
import imp
|
||||||
import os
|
import os
|
||||||
|
import platform
|
||||||
import re
|
import re
|
||||||
import socket
|
import socket
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -134,7 +135,10 @@ def FixJavaHome():
|
||||||
buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
|
buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
|
||||||
if buildbot_javahome:
|
if buildbot_javahome:
|
||||||
current_pwd = os.getenv('PWD')
|
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')
|
java_bin = os.path.join(java_home, 'bin')
|
||||||
os.environ['JAVA_HOME'] = java_home
|
os.environ['JAVA_HOME'] = java_home
|
||||||
os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])
|
os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])
|
||||||
|
|
Loading…
Reference in a new issue