| 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": "66", | 3 "nixysa_rev": "66", |
| 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": "37758", | 6 "chromium_rev": "37758", |
| 7 "o3d_code_rev": "166", | 7 "o3d_code_rev": "174", |
| 8 "skia_rev": "488", | 8 "skia_rev": "488", |
| 9 "gyp_rev": "775", | 9 "gyp_rev": "775", |
| 10 "gtest_rev": "359", | 10 "gtest_rev": "359", |
| 11 "gflags_rev": "30", | 11 "gflags_rev": "30", |
| 12 "breakpad_rev": "391", | 12 "breakpad_rev": "391", |
| 13 "v8_rev": "3608", | 13 "v8_rev": "3608", |
| 14 "nacl_rev": "1434", | 14 "nacl_rev": "1434", |
| 15 } | 15 } |
| 16 | 16 |
| 17 deps = { | 17 deps = { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 46 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var(
"o3d_code_rev"), | 46 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var(
"o3d_code_rev"), |
| 47 | 47 |
| 48 "third_party/zip_utils": | 48 "third_party/zip_utils": |
| 49 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" +
Var("o3d_code_rev"), | 49 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" +
Var("o3d_code_rev"), |
| 50 | 50 |
| 51 "third_party/selenium_rc": | 51 "third_party/selenium_rc": |
| 52 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@"
+ Var("o3d_code_rev"), | 52 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@"
+ Var("o3d_code_rev"), |
| 53 | 53 |
| 54 # Stuff that is O3D specific (from a Chrome point of view). | 54 # Stuff that is O3D specific (from a Chrome point of view). |
| 55 | 55 |
| 56 "o3d/third_party/glu": |
| 57 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/glu@" + Var("o
3d_code_rev"), |
| 58 |
| 56 "o3d/third_party/vectormath": | 59 "o3d/third_party/vectormath": |
| 57 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" +
Var("o3d_code_rev"), | 60 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" +
Var("o3d_code_rev"), |
| 58 | 61 |
| 59 "o3d/third_party/nixysa": | 62 "o3d/third_party/nixysa": |
| 60 "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"), | 63 "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"), |
| 61 | 64 |
| 62 "o3d/third_party/npapi": | 65 "o3d/third_party/npapi": |
| 63 "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_re
v"), | 66 "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_re
v"), |
| 64 | 67 |
| 65 "o3d/third_party/ply": | 68 "o3d/third_party/ply": |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 }, | 177 }, |
| 175 } | 178 } |
| 176 | 179 |
| 177 hooks = [ | 180 hooks = [ |
| 178 { | 181 { |
| 179 # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 182 # A change to a .gyp, .gypi, or to GYP itself should run the generator. |
| 180 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\
\\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$", | 183 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\
\\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$", |
| 181 "action": ["python", "o3d/build/gyp_o3d", "o3d/build/o3d.gyp", "o3d/tests/la
b/ChangeResolution/change_resolution.gyp"], | 184 "action": ["python", "o3d/build/gyp_o3d", "o3d/build/o3d.gyp", "o3d/tests/la
b/ChangeResolution/change_resolution.gyp"], |
| 182 }, | 185 }, |
| 183 ] | 186 ] |
| OLD | NEW |