client/tools/buildbot_annotated_steps.py - Issue 27668002: Revert revisions 28764, 28756, 28754, 28751

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/tools/buildbot_annotated_steps.py

Issue 27668002: Revert revisions 28764, 28756, 28754, 28751 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: client/tools/buildbot_annotated_steps.py

===================================================================

--- client/tools/buildbot_annotated_steps.py (revision 28784)

+++ client/tools/buildbot_annotated_steps.py (working copy)

@@ -15,7 +15,6 @@

import imp

import os

-import platform

import re

import socket

import subprocess

@@ -135,10 +134,7 @@

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'])

« no previous file with comments | « no previous file | editor/tools/compile_analyzer.py » ('j') | no next file with comments »