OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 DEPS = [ | 5 DEPS = [ |
6 'chromium', | 6 'chromium', |
7 'depot_tools/gclient', | 7 'depot_tools/gclient', |
| 8 'depot_tools/infra_paths', |
8 'recipe_engine/path', | 9 'recipe_engine/path', |
9 'recipe_engine/platform', | 10 'recipe_engine/platform', |
10 'recipe_engine/properties', | 11 'recipe_engine/properties', |
11 'recipe_engine/python', | 12 'recipe_engine/python', |
12 ] | 13 ] |
13 | 14 |
14 def RunSteps(api): | 15 def RunSteps(api): |
15 config_vals = {} | 16 config_vals = {} |
16 config_vals.update( | 17 config_vals.update( |
17 dict((str(k), v) for k, v in api.properties.iteritems() if k.isupper()) | 18 dict((str(k), v) for k, v in api.properties.iteritems() if k.isupper()) |
(...skipping 21 matching lines...) Expand all Loading... |
39 api.gclient.c.got_revision_mapping.pop('src', None) | 40 api.gclient.c.got_revision_mapping.pop('src', None) |
40 api.gclient.c.got_revision_mapping['src/dart'] = 'got_revision' | 41 api.gclient.c.got_revision_mapping['src/dart'] = 'got_revision' |
41 if USE_MIRROR: | 42 if USE_MIRROR: |
42 s.custom_vars.update({ | 43 s.custom_vars.update({ |
43 'dartium_base': 'svn://svn-mirror.golo.chromium.org'}) | 44 'dartium_base': 'svn://svn-mirror.golo.chromium.org'}) |
44 | 45 |
45 api.gclient.checkout() | 46 api.gclient.checkout() |
46 | 47 |
47 # gclient api incorrectly sets Path('[CHECKOUT]') to build/src/dartium.deps | 48 # gclient api incorrectly sets Path('[CHECKOUT]') to build/src/dartium.deps |
48 # because Dartium has its DEPS file in dartium.deps, not directly in src. | 49 # because Dartium has its DEPS file in dartium.deps, not directly in src. |
49 api.path['checkout'] = api.path['slave_build'].join('src') | 50 api.path['checkout'] = api.infra_paths['slave_build'].join('src') |
50 | 51 |
51 api.chromium.runhooks() | 52 api.chromium.runhooks() |
52 api.chromium.compile() | 53 api.chromium.compile() |
53 api.python('archive_build', | 54 api.python('archive_build', |
54 api.path['slave_build'].join( | 55 api.infra_paths['slave_build'].join( |
55 'src', 'dart', 'tools', 'dartium', 'multivm_archive.py'), | 56 'src', 'dart', 'tools', 'dartium', 'multivm_archive.py'), |
56 [s.revision]) | 57 [s.revision]) |
57 | 58 |
58 | 59 |
59 def GenTests(api): | 60 def GenTests(api): |
60 for plat in ('win', 'mac', 'linux'): | 61 for plat in ('win', 'mac', 'linux'): |
61 for bits in (64,): | 62 for bits in (64,): |
62 for use_mirror in (True, False): | 63 for use_mirror in (True, False): |
63 yield ( | 64 yield ( |
64 api.test('basic_%s_%s_Mirror%s' % (plat, bits, use_mirror)) + | 65 api.test('basic_%s_%s_Mirror%s' % (plat, bits, use_mirror)) + |
65 api.properties.generic( | 66 api.properties.generic( |
66 TARGET_BITS=bits, | 67 TARGET_BITS=bits, |
67 USE_MIRROR=use_mirror, | 68 USE_MIRROR=use_mirror, |
68 deps='dartium.deps', | 69 deps='dartium.deps', |
69 revision='12345') + | 70 revision='12345') + |
70 api.platform(plat, bits) | 71 api.platform(plat, bits) |
71 ) | 72 ) |
OLD | NEW |