diff --git a/DEPS b/DEPS index e93fa59d6..ce715a329 100644 --- a/DEPS +++ b/DEPS @@ -1,4 +1,10 @@ +use_relative_paths = True + vars = { + # Override root_dir in your .gclient's custom_vars to specify a custom root + # folder name. + "root_dir": "trunk", + # Use this googlecode_url variable only if there is an internal mirror for it. # If you do not know, use the full path while defining your new deps entry. "googlecode_url": "http://%s.googlecode.com/svn", @@ -13,78 +19,78 @@ vars = { # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than # https; the latter can cause problems for users behind proxies. deps = { - "trunk/chromium_deps": + "../chromium_deps": File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision")), - "trunk/build": + "build": Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"), - "trunk/testing": + "testing": Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"), - "trunk/testing/gmock": - From("trunk/chromium_deps", "src/testing/gmock"), + "testing/gmock": + From("chromium_deps", "src/testing/gmock"), - "trunk/testing/gtest": - From("trunk/chromium_deps", "src/testing/gtest"), + "testing/gtest": + From("chromium_deps", "src/testing/gtest"), - "trunk/third_party/expat": + "third_party/expat": Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"), - "trunk/third_party/google-gflags/src": + "third_party/google-gflags/src": (Var("googlecode_url") % "google-gflags") + "/trunk/src@45", - "trunk/third_party/libjpeg": + "third_party/libjpeg": Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"), - "trunk/third_party/libjpeg_turbo": - From("trunk/chromium_deps", "src/third_party/libjpeg_turbo"), + "third_party/libjpeg_turbo": + From("chromium_deps", "src/third_party/libjpeg_turbo"), - "trunk/third_party/libvpx/source/libvpx": + "third_party/libvpx/source/libvpx": "http://git.chromium.org/webm/libvpx.git@cab6ac16", - "trunk/third_party/libyuv": + "third_party/libyuv": (Var("googlecode_url") % "libyuv") + "/trunk@255", - "trunk/third_party/protobuf": + "third_party/protobuf": Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"), - "trunk/third_party/yasm": + "third_party/yasm": Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"), - "trunk/third_party/yasm/source/patched-yasm": - From("trunk/chromium_deps", "src/third_party/yasm/source/patched-yasm"), + "third_party/yasm/source/patched-yasm": + From("chromium_deps", "src/third_party/yasm/source/patched-yasm"), - "trunk/tools/clang": + "tools/clang": Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"), - "trunk/tools/gyp": - From("trunk/chromium_deps", "src/tools/gyp"), + "tools/gyp": + From("chromium_deps", "src/tools/gyp"), - "trunk/tools/python": + "tools/python": Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"), - "trunk/tools/valgrind": + "tools/valgrind": Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"), # Needed by build/common.gypi. - "trunk/tools/win/supalink": + "tools/win/supalink": Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"), } deps_os = { "win": { # Use our own, stripped down, version of Cygwin (required by GYP). - "trunk/third_party/cygwin": + "third_party/cygwin": (Var("googlecode_url") % "webrtc") + "/deps/third_party/cygwin", # Used by libjpeg-turbo. - "trunk/third_party/yasm/binaries": - From("trunk/chromium_deps", "src/third_party/yasm/binaries"), + "third_party/yasm/binaries": + From("chromium_deps", "src/third_party/yasm/binaries"), }, "unix": { - "trunk/third_party/gold": - From("trunk/chromium_deps", "src/third_party/gold"), + "third_party/gold": + From("chromium_deps", "src/third_party/gold"), }, } @@ -93,13 +99,15 @@ hooks = [ # Create a supplement.gypi file under trunk/src. This file will be picked # up by gyp and used to enable the standalone build. "pattern": ".", - "action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/src/supplement.gypi"], + "action": ["python", Var("root_dir") + "/tools/create_supplement_gypi.py", + Var("root_dir") + "/src/supplement.gypi"], }, { # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes # zero seconds to run. If something changed, it downloads a prebuilt clang. "pattern": ".", - "action": ["python", "trunk/tools/clang/scripts/update.py", "--mac-only"], + "action": ["python", Var("root_dir") + "/tools/clang/scripts/update.py", + "--mac-only"], }, { # Download test resources, i.e. video and audio files. If the latest @@ -107,12 +115,13 @@ hooks = [ # If a newer version or no current download exists, it will download # the resources and extract them. "pattern": ".", - "action": ["python", "trunk/tools/resources/update.py"], + "action": ["python", Var("root_dir") + "/tools/resources/update.py"], }, { # A change to a .gyp, .gypi, or to GYP itself should run the generator. "pattern": ".", - "action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/webrtc.gyp"], + "action": ["python", Var("root_dir") + "/build/gyp_chromium", + "--depth=" + Var("root_dir"), Var("root_dir") + "/webrtc.gyp"], }, ]