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

Side by Side Diff: DEPS

Issue 8423013: Point NSIS DEPS reference at its new home (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: fix tools_rev Created 9 years, 1 month 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 vars = { 1 vars = {
2 # These two should be updated to the same revision whenever possible. 2 # These two should be updated to the same revision whenever possible.
3 "x86_toolchain_version": "6988", 3 "x86_toolchain_version": "6988",
4 "pnacl_toolchain_version": "7066", 4 "pnacl_toolchain_version": "7066",
5 5
6 # ARM trusted toolchain version cannot be changed for now. 6 # ARM trusted toolchain version cannot be changed for now.
7 "arm_trusted_toolchain_version": "6645", 7 "arm_trusted_toolchain_version": "6645",
8 8
9 # When possible, keep chrome_rev and chromebinaries_rev at the same 9 # When possible, keep chrome_rev and chromebinaries_rev at the same
10 # value. chromebinaries_rev should match LKGR so that we can download 10 # value. chromebinaries_rev should match LKGR so that we can download
11 # the binaries, but sometimes chrome_rev needs to be more recent to get 11 # the binaries, but sometimes chrome_rev needs to be more recent to get
12 # source changes when LKGR is lagging too far back. 12 # source changes when LKGR is lagging too far back.
13 "chromebinaries_rev": "107928", 13 "chromebinaries_rev": "107928",
14 "chrome_rev": "107928", 14 "chrome_rev": "107928",
15 "chromium_trunk": "http://src.chromium.org/svn/trunk", 15 "chromium_trunk": "http://src.chromium.org/svn/trunk",
16 "googlecode_url": "http://%s.googlecode.com/svn", 16 "googlecode_url": "http://%s.googlecode.com/svn",
17 "gtest_rev": "560", 17 "gtest_rev": "560",
18 "gyp_rev": "1083", 18 "gyp_rev": "1083",
19 "lcov_rev": "54822", 19 "lcov_rev": "54822",
20 "native_client_trunk": "http://src.chromium.org/native_client/trunk", 20 "native_client_trunk": "http://src.chromium.org/native_client/trunk",
21 "o3d_trunk": "http://o3d.googlecode.com/svn/trunk", 21 "o3d_trunk": "http://o3d.googlecode.com/svn/trunk",
22 "python_26_rev": "53573", 22 "python_26_rev": "53573",
23 "tools_rev": "7066", 23 "tools_rev": "7072",
24 "valgrind_rev": "5674", 24 "valgrind_rev": "5674",
25 "wix_rev": "153", 25 "wix_rev": "153",
26 } 26 }
27 27
28 deps = { 28 deps = {
29 # This gets us Chromium's DEPS file as ../DEPS, which is where it 29 # This gets us Chromium's DEPS file as ../DEPS, which is where it
30 # needs to be when we run ../tools/clang/scripts/update.sh and it 30 # needs to be when we run ../tools/clang/scripts/update.sh and it
31 # wants to grep clang_revision out of it. 31 # wants to grep clang_revision out of it.
32 ".": 32 ".":
33 File(Var("chromium_trunk") + "/src/DEPS@" + Var("chrome_rev")), 33 File(Var("chromium_trunk") + "/src/DEPS@" + Var("chrome_rev")),
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 "tools/valgrind": 101 "tools/valgrind":
102 Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chrome_rev"), 102 Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chrome_rev"),
103 } 103 }
104 104
105 deps_os = { 105 deps_os = {
106 "win": { 106 "win": {
107 "third_party/mingw-w64/mingw/bin": 107 "third_party/mingw-w64/mingw/bin":
108 (Var("native_client_trunk") + "/deps/third_party/mingw-w64/mingw/bin@" + 108 (Var("native_client_trunk") + "/deps/third_party/mingw-w64/mingw/bin@" +
109 Var("tools_rev")), 109 Var("tools_rev")),
110 "third_party/NSIS": 110 "third_party/NSIS":
111 (Var("native_client_trunk") + "/src/third_party/NSIS@" + 111 (Var("native_client_trunk") + "/deps/third_party/NSIS@" +
112 Var("tools_rev")), 112 Var("tools_rev")),
113 "third_party/python_26": 113 "third_party/python_26":
114 (Var("chromium_trunk") + "/tools/third_party/python_26@" + 114 (Var("chromium_trunk") + "/tools/third_party/python_26@" +
115 Var("python_26_rev")), 115 Var("python_26_rev")),
116 }, 116 },
117 } 117 }
118 118
119 hooks = [ 119 hooks = [
120 { 120 {
121 "pattern": ".", 121 "pattern": ".",
122 "action": ["python", "native_client/build/download_toolchains.py", 122 "action": ["python", "native_client/build/download_toolchains.py",
123 "--x86-version", Var("x86_toolchain_version"), 123 "--x86-version", Var("x86_toolchain_version"),
124 "--arm-trusted-version", Var("arm_trusted_toolchain_version"), 124 "--arm-trusted-version", Var("arm_trusted_toolchain_version"),
125 "--pnacl-version", Var("pnacl_toolchain_version")], 125 "--pnacl-version", Var("pnacl_toolchain_version")],
126 }, 126 },
127 { 127 {
128 "pattern": ".", 128 "pattern": ".",
129 "action": ["python", "native_client/build/gyp_nacl"], 129 "action": ["python", "native_client/build/gyp_nacl"],
130 }, 130 },
131 ] 131 ]
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698