diff options
Diffstat (limited to 'WebKit/chromium/DEPS')
| -rw-r--r-- | WebKit/chromium/DEPS | 138 |
1 files changed, 61 insertions, 77 deletions
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS index 9c45b83..4fc0372 100644 --- a/WebKit/chromium/DEPS +++ b/WebKit/chromium/DEPS @@ -32,55 +32,43 @@ vars = { 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', - 'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party', - - # Dependencies' revisions to use: - 'chromium_rev': '38580', - 'google-url_rev': '121', - 'gtest_rev': '359', - 'gyp_rev': '781', - 'icu_rev': '37341', - 'openvcdiff_rev': '28', - 'ots_rev': '26', - 'skia_rev': '490', - 'v8_rev': '3781', - - # Windows: - 'cygwin_rev': '11984', - 'ffmpeg_ia32_rev': '34297', - 'pthreads-win32_rev': '26716', - 'python_24_rev': '22967', - 'nss_rev': '36871', + 'chromium_rev': '65229' } deps = { + 'chromium_deps': + File(Var('chromium_svn')+'/DEPS@'+Var('chromium_rev')), + # build tools 'build': Var('chromium_svn')+'/build@'+Var('chromium_rev'), + 'tools/data_pack': + Var('chromium_svn')+'/tools/data_pack@'+Var('chromium_rev'), 'tools/gyp': - 'http://gyp.googlecode.com/svn/trunk@'+Var('gyp_rev'), + From('chromium_deps', 'src/tools/gyp'), # Basic tools 'base': Var('chromium_svn')+'/base@'+Var('chromium_rev'), + 'gfx': + Var('chromium_svn')+'/gfx@'+Var('chromium_rev'), # skia dependencies 'skia': Var('chromium_svn')+'/skia@'+Var('chromium_rev'), - 'third_party/skia': - 'http://skia.googlecode.com/svn/trunk@'+Var('skia_rev'), + 'third_party/skia/src': + From('chromium_deps', 'src/third_party/skia/src'), + 'third_party/skia/include': + From('chromium_deps', 'src/third_party/skia/include'), # testing 'testing': Var('chromium_svn')+'/testing@'+Var('chromium_rev'), 'testing/gtest': - 'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'), + From('chromium_deps', 'src/testing/gtest'), # v8 javascript engine - 'v8': - 'http://v8.googlecode.com/svn/trunk@'+Var('v8_rev'), - 'testing/gtest': - 'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'), + 'v8': From('chromium_deps', 'src/v8'), # net dependencies 'net': @@ -88,73 +76,69 @@ deps = { 'sdch': Var('chromium_svn')+'/sdch@'+Var('chromium_rev'), 'sdch/open-vcdiff': - 'http://open-vcdiff.googlecode.com/svn/trunk@'+Var('openvcdiff_rev'), + From('chromium_deps', 'src/sdch/open-vcdiff'), 'googleurl': - 'http://google-url.googlecode.com/svn/trunk@'+Var('google-url_rev'), + From('chromium_deps', 'src/googleurl'), + + # webkit dependencies + 'webkit': Var('chromium_svn')+'/webkit@'+Var('chromium_rev'), + + 'app': + Var('chromium_svn')+'/app@'+Var('chromium_rev'), # needed by appcache + 'gpu': + Var('chromium_svn')+'/gpu@'+Var('chromium_rev'), + 'media': + Var('chromium_svn')+'/media@'+Var('chromium_rev'), + 'printing': + Var('chromium_svn')+'/printing@'+Var('chromium_rev'), + 'ppapi': + Var('chromium_svn')+'/ppapi@'+Var('chromium_rev'), + 'third_party/angle': # needed by the gpu process + From('chromium_deps', 'src/third_party/angle'), + 'third_party/ffmpeg': # needed by webkit/media + From('chromium_deps', 'src/third_party/ffmpeg'), + 'third_party/libwebp': + Var('chromium_svn')+'/third_party/libwebp@'+Var('chromium_rev'), + 'tools/grit': + Var('chromium_svn')+'/tools/grit@'+Var('chromium_rev'), + 'tools/generate_stubs': + Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'), # other third party + 'third_party': + Var('chromium_svn')+'/third_party@'+Var('chromium_rev'), 'third_party/icu': - Var('chromium_deps_svn')+'/icu42@'+Var('icu_rev'), - - 'third_party/bzip2': - Var('chromium_svn')+'/third_party/bzip2@'+Var('chromium_rev'), - - 'third_party/libevent': - Var('chromium_svn')+'/third_party/libevent@'+Var('chromium_rev'), - - 'third_party/libjpeg': - Var('chromium_svn')+'/third_party/libjpeg@'+Var('chromium_rev'), - - 'third_party/libpng': - Var('chromium_svn')+'/third_party/libpng@'+Var('chromium_rev'), - - 'third_party/libxml': - Var('chromium_svn')+'/third_party/libxml@'+Var('chromium_rev'), - - 'third_party/libxslt': - Var('chromium_svn')+'/third_party/libxslt@'+Var('chromium_rev'), - - 'third_party/modp_b64': - Var('chromium_svn')+'/third_party/modp_b64@'+Var('chromium_rev'), - - 'third_party/npapi': - Var('chromium_svn')+'/third_party/npapi@'+Var('chromium_rev'), - + From('chromium_deps', 'src/third_party/icu'), 'third_party/ots': - 'http://ots.googlecode.com/svn/trunk@'+Var('ots_rev'), - - 'third_party/sqlite': - Var('chromium_svn')+'/third_party/sqlite@'+Var('chromium_rev'), - - 'third_party/zlib': - Var('chromium_svn')+'/third_party/zlib@'+Var('chromium_rev'), + From('chromium_deps', 'src/third_party/ots'), } deps_os = { 'win': { 'third_party/cygwin': - Var('chromium_deps_svn')+'/cygwin@'+Var('cygwin_rev'), - + From('chromium_deps', 'src/third_party/cygwin'), 'third_party/python_24': - Var('chromium_deps_svn')+'/python_24@'+Var('python_24_rev'), - + From('chromium_deps', 'src/third_party/python_24'), 'third_party/ffmpeg/binaries/chromium/win/ia32': - Var('chromium_deps_svn')+'/ffmpeg/binaries/win@'+Var('ffmpeg_ia32_rev'), - - 'third_party/pthreads-win32': - Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'), - - # base.gypi depends on nss on Windows - 'third_party/nss': - Var('chromium_deps_svn')+'/nss@'+Var('nss_rev'), + From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'), + 'third_party/lighttpd': + From('chromium_deps', 'src/third_party/lighttpd'), + 'third_party/nss': + From('chromium_deps', 'src/third_party/nss'), + }, + 'mac': { + # needed by ffmpeg + 'third_party/yasm/source/patched-yasm': + From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'), + 'third_party/nss': + From('chromium_deps', 'src/third_party/nss'), }, 'unix': { # Linux, actually. - 'third_party/harfbuzz': - Var('chromium_svn')+'/third_party/harfbuzz@'+Var('chromium_rev'), - 'tools/xdisplaycheck': Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'), + 'third_party/yasm/source/patched-yasm': + From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'), }, } |