| OLD | NEW |
| 1 vars = { | 1 vars = { |
| 2 # Use this googlecode_url variable only if there is an internal mirror for it. | 2 # Use this googlecode_url variable only if there is an internal mirror for it. |
| 3 # If you do not know, use the full path while defining your new deps entry. | 3 # If you do not know, use the full path while defining your new deps entry. |
| 4 "googlecode_url": "http://%s.googlecode.com/svn", | 4 "googlecode_url": "http://%s.googlecode.com/svn", |
| 5 "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", | 5 "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", |
| 6 "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", | 6 "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", |
| 7 "nacl_trunk": "http://src.chromium.org/native_client/trunk", | 7 "nacl_trunk": "http://src.chromium.org/native_client/trunk", |
| 8 "webkit_revision": "101035", | 8 "webkit_revision": "101035", |
| 9 "chromium_git": "http://git.chromium.org/git", | 9 "chromium_git": "http://git.chromium.org/git", |
| 10 "swig_revision": "69281", | 10 "swig_revision": "69281", |
| 11 "nacl_revision": "7169", | 11 "nacl_revision": "7281", |
| 12 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS | 12 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS |
| 13 # to update other nacl_*_revision's. | 13 # to update other nacl_*_revision's. |
| 14 "nacl_tools_revision": "7139", # native_client/DEPS: tools_rev | 14 "nacl_tools_revision": "7139", # native_client/DEPS: tools_rev |
| 15 | 15 |
| 16 # These hashes need to be updated when nacl_toolchain_revision is changed. | 16 # These hashes need to be updated when nacl_toolchain_revision is changed. |
| 17 # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the | 17 # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the |
| 18 # new values. | 18 # new values. |
| 19 "nacl_toolchain_linux_x86_hash": |
| 20 "33afa1cefa7fd2a7270b309298dbbf93361d90db", |
| 21 "nacl_toolchain_linux_x86_newlib_hash": |
| 22 "5f82c18ce9d0201f9df852bddcb19746ef690290", |
| 23 "nacl_toolchain_mac_x86_hash": |
| 24 "f7b73f3d9073b75bb1ef6b583eaf56f397ca80ed", |
| 19 "nacl_toolchain_mac_x86_newlib_hash": | 25 "nacl_toolchain_mac_x86_newlib_hash": |
| 20 "74612a65dd6bae1d85af1f7277cc6af6e5d86b46", | 26 "648b5ae8ae770b41c4a0eef28cff6f67fe8bb386", |
| 27 "nacl_toolchain_win_x86_hash": |
| 28 "75ee1d6f8c758d9580b2c35773b14d0ab6847372", |
| 21 "nacl_toolchain_win_x86_newlib_hash": | 29 "nacl_toolchain_win_x86_newlib_hash": |
| 22 "3672e7b20848beec886badc46909cf24fb1c574f", | 30 "a340bc72900f002f88491bf82baf69d35593ed75", |
| 23 "nacl_toolchain_linux_x86_newlib_hash": | 31 "nacl_toolchain_revision": "7258", |
| 24 "528b9b85d087ffb5a0f6348f5219a33cd0ff725f", | |
| 25 "nacl_toolchain_revision": "7098", | |
| 26 | 32 |
| 27 "libjingle_revision": "95", | 33 "libjingle_revision": "95", |
| 28 "libvpx_revision": "109236", | 34 "libvpx_revision": "109236", |
| 29 "ffmpeg_revision": "109946", | 35 "ffmpeg_revision": "109946", |
| 30 "sfntly_revision": "98", | 36 "sfntly_revision": "98", |
| 31 "skia_revision": "2730", | 37 "skia_revision": "2730", |
| 32 # Three lines of non-changing comments so that | 38 # Three lines of non-changing comments so that |
| 33 # the commit queue can handle CLs rolling Skia | 39 # the commit queue can handle CLs rolling Skia |
| 34 # and V8 without interference from each other. | 40 # and V8 without interference from each other. |
| 35 "v8_revision": "10037", | 41 "v8_revision": "10037", |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 (Var("googlecode_url") % "grit-i18n") + "/trunk@7", | 101 (Var("googlecode_url") % "grit-i18n") + "/trunk@7", |
| 96 | 102 |
| 97 "src/tools/gyp": | 103 "src/tools/gyp": |
| 98 (Var("googlecode_url") % "gyp") + "/trunk@1096", | 104 (Var("googlecode_url") % "gyp") + "/trunk@1096", |
| 99 | 105 |
| 100 "src/v8": | 106 "src/v8": |
| 101 (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), | 107 (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), |
| 102 | 108 |
| 103 "src/native_client": | 109 "src/native_client": |
| 104 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), | 110 Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), |
| 111 |
| 112 "src/native_client_sdk/src/site_scons": |
| 113 Var("nacl_trunk") + "/src/native_client/site_scons@" + Var("nacl_revision"), |
| 114 |
| 115 "src/third_party/pymox": |
| 116 "http://pymox.googlecode.com/svn/trunk@61", |
| 105 | 117 |
| 106 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": | 118 "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": |
| 107 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + | 119 Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + |
| 108 Var("nacl_revision"), | 120 Var("nacl_revision"), |
| 109 | 121 |
| 110 "src/third_party/sfntly/src/sfntly": | 122 "src/third_party/sfntly/src/sfntly": |
| 111 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src/sfntly@" + | 123 (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src/sfntly@" + |
| 112 Var("sfntly_revision"), | 124 Var("sfntly_revision"), |
| 113 | 125 |
| 114 "src/third_party/skia/src": | 126 "src/third_party/skia/src": |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 | 428 |
| 417 | 429 |
| 418 hooks = [ | 430 hooks = [ |
| 419 { | 431 { |
| 420 # This downloads binaries for Native Client's newlib toolchain. | 432 # This downloads binaries for Native Client's newlib toolchain. |
| 421 # Done in lieu of building the toolchain from scratch as it can take | 433 # Done in lieu of building the toolchain from scratch as it can take |
| 422 # anywhere from 30 minutes to 4 hours depending on platform to build. | 434 # anywhere from 30 minutes to 4 hours depending on platform to build. |
| 423 "pattern": ".", | 435 "pattern": ".", |
| 424 "action": [ | 436 "action": [ |
| 425 "python", "src/build/download_nacl_toolchains.py", | 437 "python", "src/build/download_nacl_toolchains.py", |
| 438 "--no-pnacl", |
| 439 "--no-arm-trusted", |
| 426 "--x86-version", Var("nacl_toolchain_revision"), | 440 "--x86-version", Var("nacl_toolchain_revision"), |
| 427 "--nacl-newlib-only", | |
| 428 "--file-hash", "mac_x86_newlib", | 441 "--file-hash", "mac_x86_newlib", |
| 429 Var("nacl_toolchain_mac_x86_newlib_hash"), | 442 Var("nacl_toolchain_mac_x86_newlib_hash"), |
| 430 "--file-hash", "win_x86_newlib", | 443 "--file-hash", "win_x86_newlib", |
| 431 Var("nacl_toolchain_win_x86_newlib_hash"), | 444 Var("nacl_toolchain_win_x86_newlib_hash"), |
| 432 "--file-hash", "linux_x86_newlib", | 445 "--file-hash", "linux_x86_newlib", |
| 433 Var("nacl_toolchain_linux_x86_newlib_hash"), | 446 Var("nacl_toolchain_linux_x86_newlib_hash"), |
| 447 "--file-hash", "mac_x86", |
| 448 Var("nacl_toolchain_mac_x86_hash"), |
| 449 "--file-hash", "win_x86", |
| 450 Var("nacl_toolchain_win_x86_hash"), |
| 451 "--file-hash", "linux_x86", |
| 452 Var("nacl_toolchain_linux_x86_hash"), |
| 453 "--save-downloads-dir", |
| 454 "src/native_client_sdk/src/build_tools/toolchain_archives", |
| 434 ], | 455 ], |
| 435 }, | 456 }, |
| 436 { | 457 { |
| 437 # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes | 458 # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes |
| 438 # zero seconds to run. If something changed, it downloads a prebuilt clang, | 459 # zero seconds to run. If something changed, it downloads a prebuilt clang, |
| 439 # which takes ~20s, but clang speeds up builds by more than 20s. | 460 # which takes ~20s, but clang speeds up builds by more than 20s. |
| 440 "pattern": ".", | 461 "pattern": ".", |
| 441 "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"], | 462 "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"], |
| 442 }, | 463 }, |
| 443 { | 464 { |
| 444 # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 465 # A change to a .gyp, .gypi, or to GYP itself should run the generator. |
| 445 "pattern": ".", | 466 "pattern": ".", |
| 446 "action": ["python", "src/build/gyp_chromium"], | 467 "action": ["python", "src/build/gyp_chromium"], |
| 447 }, | 468 }, |
| 448 ] | 469 ] |
| OLD | NEW |