OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 2 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
3 # for details. All rights reserved. Use of this source code is governed by a | 3 # for details. All rights reserved. Use of this source code is governed by a |
4 # BSD-style license that can be found in the LICENSE file. | 4 # BSD-style license that can be found in the LICENSE file. |
5 | 5 |
6 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 6 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
7 # Use of this source code is governed by a BSD-style license that can be | 7 # Use of this source code is governed by a BSD-style license that can be |
8 # found in the LICENSE file. | 8 # found in the LICENSE file. |
9 | 9 |
10 """Dart client buildbot steps | 10 """Dart client buildbot steps |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 has_shell=True | 126 has_shell=True |
127 return subprocess.call([sys.executable, | 127 return subprocess.call([sys.executable, |
128 os.path.join('tools', 'bots', target + '.py')], | 128 os.path.join('tools', 'bots', target + '.py')], |
129 env=os.environ, shell=has_shell) | 129 env=os.environ, shell=has_shell) |
130 | 130 |
131 def FixJavaHome(): | 131 def FixJavaHome(): |
132 buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME') | 132 buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME') |
133 if buildbot_javahome: | 133 if buildbot_javahome: |
134 current_pwd = os.getenv('PWD') | 134 current_pwd = os.getenv('PWD') |
135 java_home = os.path.join(current_pwd, buildbot_javahome) | 135 java_home = os.path.join(current_pwd, buildbot_javahome) |
| 136 java_bin = os.path.join(java_home, 'bin') |
136 os.environ['JAVA_HOME'] = java_home | 137 os.environ['JAVA_HOME'] = java_home |
137 print 'Setting java home to' | 138 os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH']) |
138 print java_home | 139 |
| 140 print 'Setting java home to ', java_home |
139 sys.stdout.flush() | 141 sys.stdout.flush() |
140 | 142 |
141 def ClobberBuilder(): | 143 def ClobberBuilder(): |
142 """ Clobber the builder before we do the build. | 144 """ Clobber the builder before we do the build. |
143 """ | 145 """ |
144 cmd = [sys.executable, | 146 cmd = [sys.executable, |
145 './tools/clean_output_directory.py'] | 147 './tools/clean_output_directory.py'] |
146 print 'Clobbering %s' % (' '.join(cmd)) | 148 print 'Clobbering %s' % (' '.join(cmd)) |
147 return subprocess.call(cmd) | 149 return subprocess.call(cmd) |
148 | 150 |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 status = ProcessBot(name, 'compiler') | 221 status = ProcessBot(name, 'compiler') |
220 | 222 |
221 if status: | 223 if status: |
222 print '@@@STEP_FAILURE@@@' | 224 print '@@@STEP_FAILURE@@@' |
223 | 225 |
224 return status | 226 return status |
225 | 227 |
226 | 228 |
227 if __name__ == '__main__': | 229 if __name__ == '__main__': |
228 sys.exit(main()) | 230 sys.exit(main()) |
OLD | NEW |