OLD | NEW |
1 vars = { | 1 vars = { |
2 "chromium_trunk": "http://src.chromium.org/svn/trunk", | 2 "chromium_trunk": "http://src.chromium.org/svn/trunk", |
3 "nixysa_rev": "73", | 3 "nixysa_rev": "73", |
4 # When updating the chromium rev, you must also update the nss and sqlite | 4 # When updating the chromium rev, you must also update the nss and sqlite |
5 # revs to match the version pulled-in by Chromium's own DEPS in the new rev. | 5 # revs to match the version pulled-in by Chromium's own DEPS in the new rev. |
6 "chromium_rev": "51794", | 6 "chromium_rev": "51794", |
7 "chromium_breakpad_rev": "47985", | 7 "chromium_breakpad_rev": "47985", |
8 "o3d_code_rev": "227", | 8 "o3d_code_rev": "229", |
9 "skia_rev": "586", | 9 "skia_rev": "586", |
10 "gyp_rev": "820", | 10 "gyp_rev": "820", |
11 "gtest_rev": "408", | 11 "gtest_rev": "408", |
12 "gflags_rev": "30", | 12 "gflags_rev": "30", |
13 "breakpad_rev": "604", | 13 "breakpad_rev": "604", |
14 "v8_rev": "5017", | 14 "v8_rev": "5017", |
15 } | 15 } |
16 | 16 |
17 deps = { | 17 deps = { |
18 "o3d/o3d_assets": | 18 "o3d/o3d_assets": |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 deps_os = { | 152 deps_os = { |
153 "win": { | 153 "win": { |
154 "third_party/wix_2_0_4221": | 154 "third_party/wix_2_0_4221": |
155 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221
@" + Var("o3d_code_rev"), | 155 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221
@" + Var("o3d_code_rev"), |
156 | 156 |
157 "third_party/cygwin": | 157 "third_party/cygwin": |
158 "/trunk/deps/third_party/cygwin@11984", | 158 "/trunk/deps/third_party/cygwin@11984", |
159 | 159 |
160 "third_party/python_24": | 160 "third_party/python_24": |
161 Var("chromium_trunk") + "/deps/third_party/python_24@19441", | 161 Var("chromium_trunk") + "/deps/third_party/python_24@19441", |
| 162 |
| 163 "third_party/pixman": |
| 164 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pixman@" + V
ar("o3d_code_rev"), |
| 165 |
| 166 "third_party/cairo": |
| 167 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cairo@" + Va
r("o3d_code_rev"), |
| 168 }, |
| 169 "mac": { |
| 170 "third_party/pixman": |
| 171 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pixman@" + V
ar("o3d_code_rev"), |
| 172 |
| 173 "third_party/cairo": |
| 174 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cairo@" + Va
r("o3d_code_rev"), |
162 }, | 175 }, |
163 "unix": { | 176 "unix": { |
164 # Linux, really. | 177 # Linux, really. |
165 "tools/xdisplaycheck": | 178 "tools/xdisplaycheck": |
166 Var("chromium_trunk") + "/src/tools/xdisplaycheck@" + Var("chromium_rev"), | 179 Var("chromium_trunk") + "/src/tools/xdisplaycheck@" + Var("chromium_rev"), |
167 }, | 180 }, |
168 } | 181 } |
169 | 182 |
170 hooks = [ | 183 hooks = [ |
171 { | 184 { |
172 # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 185 # A change to a .gyp, .gypi, or to GYP itself should run the generator. |
173 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\
\\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$", | 186 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\
\\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$", |
174 "action": ["python", "o3d/build/gyp_o3d", "o3d/build/o3d.gyp", "o3d/tests/la
b/ChangeResolution/change_resolution.gyp"], | 187 "action": ["python", "o3d/build/gyp_o3d", "o3d/build/o3d.gyp", "o3d/tests/la
b/ChangeResolution/change_resolution.gyp"], |
175 }, | 188 }, |
176 ] | 189 ] |
177 | 190 |
OLD | NEW |