| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 if '-win' in name: | 125 if '-win' in name: |
| 126 # In Windows we need to run in the shell, so that we have all the | 126 # In Windows we need to run in the shell, so that we have all the |
| 127 # environment variables available. | 127 # environment variables available. |
| 128 has_shell = True | 128 has_shell = True |
| 129 return subprocess.call([sys.executable, | 129 return subprocess.call([sys.executable, |
| 130 os.path.join('tools', 'bots', target + '.py')], | 130 os.path.join('tools', 'bots', target + '.py')], |
| 131 env=environment, shell=has_shell) | 131 env=environment, shell=has_shell) |
| 132 | 132 |
| 133 def FixJavaHome(): | 133 def FixJavaHome(): |
| 134 buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME') | 134 buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME') |
| 135 print 'value of buildbot_javahome ' + buildbot_javahome | |
| 136 if buildbot_javahome: | 135 if buildbot_javahome: |
| 137 print 'in buildbot_javahome' | |
| 138 current_pwd = os.getenv('PWD') | 136 current_pwd = os.getenv('PWD') |
| 139 java_home = os.path.join(current_pwd, buildbot_javahome) | 137 java_home = '/usr/lib/jvm/java-6-sun'#os.path.join(current_pwd, buildbot_jav
ahome) |
| 140 java_bin = os.path.join(java_home, 'bin') | 138 java_bin = os.path.join(java_home, 'bin') |
| 141 os.environ['JAVA_HOME'] = java_home | 139 os.environ['JAVA_HOME'] = java_home |
| 142 os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH']) | 140 os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH']) |
| 143 | 141 |
| 144 print 'Setting java home to ', java_home | 142 print 'Setting java home to ', java_home |
| 145 sys.stdout.flush() | 143 sys.stdout.flush() |
| 146 | 144 |
| 147 def ClobberBuilder(): | 145 def ClobberBuilder(): |
| 148 """ Clobber the builder before we do the build. | 146 """ Clobber the builder before we do the build. |
| 149 """ | 147 """ |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 status = ProcessBot(name, 'compiler') | 204 status = ProcessBot(name, 'compiler') |
| 207 | 205 |
| 208 if status: | 206 if status: |
| 209 print '@@@STEP_FAILURE@@@' | 207 print '@@@STEP_FAILURE@@@' |
| 210 | 208 |
| 211 return status | 209 return status |
| 212 | 210 |
| 213 | 211 |
| 214 if __name__ == '__main__': | 212 if __name__ == '__main__': |
| 215 sys.exit(main()) | 213 sys.exit(main()) |
| OLD | NEW |