| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 | 80 |
| 81 args: | 81 args: |
| 82 srcpath - the location of the source code to build | 82 srcpath - the location of the source code to build |
| 83 mode - the mode release or debug | 83 mode - the mode release or debug |
| 84 version - the svn version of the currently checked out code | 84 version - the svn version of the currently checked out code |
| 85 ''' | 85 ''' |
| 86 print 'ProcessTools' | 86 print 'ProcessTools' |
| 87 | 87 |
| 88 toolsBuildScript = os.path.join('.', 'editor', 'build', 'build.py') | 88 toolsBuildScript = os.path.join('.', 'editor', 'build', 'build.py') |
| 89 | 89 |
| 90 build_installer = name.startswith('dart-editor-installer') |
| 91 |
| 90 # TODO(devoncarew): should we move this into GetBuildInfo()? | 92 # TODO(devoncarew): should we move this into GetBuildInfo()? |
| 91 # get the latest changed revision from the current repository sub-tree | 93 # get the latest changed revision from the current repository sub-tree |
| 92 version = GetLatestChangedRevision() | 94 version = GetLatestChangedRevision() |
| 93 | 95 |
| 94 outdir = GetOutDir(mode) | 96 outdir = GetOutDir(mode) |
| 95 cmds = [sys.executable, toolsBuildScript, | 97 cmds = [sys.executable, toolsBuildScript, |
| 96 '--mode=' + mode, '--revision=' + version, | 98 '--mode=' + mode, '--revision=' + version, |
| 97 '--name=' + name, '--out=' + outdir] | 99 '--name=' + name, '--out=' + outdir] |
| 100 if build_installer: |
| 101 cmds.append('--build-installer') |
| 98 local_env = EnvironmentWithoutBotoConfig() | 102 local_env = EnvironmentWithoutBotoConfig() |
| 99 #if 'linux' in name: | 103 #if 'linux' in name: |
| 100 # javahome = os.path.join(os.path.expanduser('~'), 'jdk1.6.0_25') | 104 # javahome = os.path.join(os.path.expanduser('~'), 'jdk1.6.0_25') |
| 101 # local_env['JAVA_HOME'] = javahome | 105 # local_env['JAVA_HOME'] = javahome |
| 102 # local_env['PATH'] = (os.path.join(javahome, 'bin') + | 106 # local_env['PATH'] = (os.path.join(javahome, 'bin') + |
| 103 # os.pathsep + local_env['PATH']) | 107 # os.pathsep + local_env['PATH']) |
| 104 | 108 |
| 105 return subprocess.call(cmds, env=local_env) | 109 return subprocess.call(cmds, env=local_env) |
| 106 | 110 |
| 107 def EnvironmentWithoutBotoConfig(environment=None): | 111 def EnvironmentWithoutBotoConfig(environment=None): |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 status = ProcessBot(name, 'compiler') | 208 status = ProcessBot(name, 'compiler') |
| 205 | 209 |
| 206 if status: | 210 if status: |
| 207 print '@@@STEP_FAILURE@@@' | 211 print '@@@STEP_FAILURE@@@' |
| 208 | 212 |
| 209 return status | 213 return status |
| 210 | 214 |
| 211 | 215 |
| 212 if __name__ == '__main__': | 216 if __name__ == '__main__': |
| 213 sys.exit(main()) | 217 sys.exit(main()) |
| OLD | NEW |