Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: dartium.deps/DEPS

Issue 429073003: Dartium 37 to bleeding edge (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/deps
Patch Set: Pull in gyp fix Created 6 years, 4 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | dartium.deps/DEPS.chromium » ('j') | dartium.deps/DEPS.chromium » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 import gclient_utils 1 import gclient_utils
2 import os 2 import os
3 3
4 path = gclient_utils.FindGclientRoot(os.getcwd()) 4 path = gclient_utils.FindGclientRoot(os.getcwd())
5 execfile(os.path.join(path, 'dartium.deps', 'DEPS.chromium')) # Include proper C hromium DEPS. 5 execfile(os.path.join(path, 'dartium.deps', 'DEPS.chromium')) # Include proper C hromium DEPS.
6 6
7 # Now we need to override some settings and add some new ones. 7 # Now we need to override some settings and add some new ones.
8 8
9 vars.update({ 9 vars.update({
10 "chromium_url": "http://src.chromium.org/svn", 10 "chromium_url": "http://src.chromium.org/svn",
11 "dartium_base": "http://src.chromium.org", 11 "dartium_base": "http://src.chromium.org",
12 "dartium_chromium_branch": "/chrome/branches/dart/1985/src", 12 "dartium_chromium_branch": "/chrome/branches/dart/dartium/src",
ricow1 2014/07/30 12:04:32 this seems strange
Bill Hesse 2014/07/30 12:38:31 dartium_chromium_revision is the rev of the dartiu
vsm 2014/07/30 12:41:15 Yes, we're moving to a new scheme. We'll have the
13 "dartium_chromium_revision": "286245", 13 "dartium_chromium_revision": "284674",
14 "chromium_base_revision": "269467", 14 "chromium_base_revision": "278856",
Bill Hesse 2014/07/30 12:52:30 This should be changed to # Git hash for archiv
15 "dart_branch": "/branches/bleeding_edge", 15 "dart_branch": "/branches/bleeding_edge",
16 "dartium_webkit_branch": "/blink/branches/dart/1985", 16 "dartium_webkit_branch": "/blink/branches/dart/dartium",
ricow1 2014/07/30 12:04:32 this also seems strange
17 "dartium_webkit_revision": "178946", 17 "dartium_webkit_revision": "179229",
18 18
19 "co19_rev": "@738", 19 "co19_rev": "@738",
20 "fake_async_rev": "@38614",
21 }) 20 })
22 21
23 def massage_deps(deps): 22 def massage_deps(deps):
24 for key, value in deps.items(): 23 for key, value in deps.items():
25 if value is None: continue 24 if value is None: continue
26 25
27 if value.startswith('/trunk'): 26 if value.startswith('/trunk'):
28 deps[key] = Var("chromium_url") + value 27 deps[key] = Var("chromium_url") + value
29 continue 28 continue
30 29
(...skipping 13 matching lines...) Expand all
44 "src": 43 "src":
45 Var("dartium_base") + Var("dartium_chromium_branch") + "@" + 44 Var("dartium_base") + Var("dartium_chromium_branch") + "@" +
46 Var("dartium_chromium_revision"), 45 Var("dartium_chromium_revision"),
47 46
48 "src/dart": 47 "src/dart":
49 Var("dart_branch") + "/dart", 48 Var("dart_branch") + "/dart",
50 49
51 "src/dart/third_party/WebCore": 50 "src/dart/third_party/WebCore":
52 "/third_party/WebCore", 51 "/third_party/WebCore",
53 52
54 "src/dart/third_party/pkg/fake_async":
55 "/third_party/fake_async" + Var("fake_async_rev"),
56
57 "src/dart/tests/co19/src": ((Var("googlecode_url") % "co19") + 53 "src/dart/tests/co19/src": ((Var("googlecode_url") % "co19") +
58 "/trunk/co19/tests/co19/src" + Var("co19_rev")), 54 "/trunk/co19/tests/co19/src" + Var("co19_rev")),
59 55
60 }) 56 })
61 57
62 deps_os['win'].update({ 58 deps_os['win'].update({
63 "src/chrome/tools/test/reference_build/chrome_win": None 59 "src/chrome/tools/test/reference_build/chrome_win": None
64 }) 60 })
65 deps_os['mac'].update({ 61 deps_os['mac'].update({
66 "src/chrome/tools/test/reference_build/chrome_mac": None 62 "src/chrome/tools/test/reference_build/chrome_mac": None
67 }) 63 })
68 deps_os['unix'].update({ 64 deps_os['unix'].update({
(...skipping 17 matching lines...) Expand all
86 hooks.append({ 82 hooks.append({
87 # Peg the blink version number in LASTCHANGE.blink to be the upstream 83 # Peg the blink version number in LASTCHANGE.blink to be the upstream
88 # webkit_revision number so that chrome remote devtools pulls assets from 84 # webkit_revision number so that chrome remote devtools pulls assets from
89 # the right place. 85 # the right place.
90 "name": "lastchange", 86 "name": "lastchange",
91 "pattern": ".", 87 "pattern": ".",
92 "action": ["python", "-c", 88 "action": ["python", "-c",
93 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" + 89 "f=open('src/build/util/LASTCHANGE.blink','w'); f.write('LASTCHANGE=" +
94 Var('webkit_revision') + "\\n')" ], 90 Var('webkit_revision') + "\\n')" ],
95 }) 91 })
OLDNEW
« no previous file with comments | « no previous file | dartium.deps/DEPS.chromium » ('j') | dartium.deps/DEPS.chromium » ('J')

Powered by Google App Engine
This is Rietveld 408576698