Use unix line endings in DEPS.
This was (I think) causing trybot patches to DEPS to fail. TBR=kjellander@webrtc.org BUG=none Review URL: https://webrtc-codereview.appspot.com/718004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2542 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
parent
4147562088
commit
4ce52bb75d
236
DEPS
236
DEPS
@ -1,118 +1,118 @@
|
|||||||
vars = {
|
vars = {
|
||||||
# Use this googlecode_url variable only if there is an internal mirror for it.
|
# 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.
|
# If you do not know, use the full path while defining your new deps entry.
|
||||||
"googlecode_url": "http://%s.googlecode.com/svn",
|
"googlecode_url": "http://%s.googlecode.com/svn",
|
||||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
||||||
"chromium_revision": "143348",
|
"chromium_revision": "143348",
|
||||||
|
|
||||||
# External resources like video and audio files used for testing purposes.
|
# External resources like video and audio files used for testing purposes.
|
||||||
# Downloaded on demand when needed.
|
# Downloaded on demand when needed.
|
||||||
"webrtc_resources_revision": "9",
|
"webrtc_resources_revision": "9",
|
||||||
}
|
}
|
||||||
|
|
||||||
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
||||||
# https; the latter can cause problems for users behind proxies.
|
# https; the latter can cause problems for users behind proxies.
|
||||||
deps = {
|
deps = {
|
||||||
"trunk/chromium_deps":
|
"trunk/chromium_deps":
|
||||||
File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision")),
|
File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision")),
|
||||||
|
|
||||||
"trunk/build":
|
"trunk/build":
|
||||||
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/testing":
|
"trunk/testing":
|
||||||
Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/testing/gmock":
|
"trunk/testing/gmock":
|
||||||
From("trunk/chromium_deps", "src/testing/gmock"),
|
From("trunk/chromium_deps", "src/testing/gmock"),
|
||||||
|
|
||||||
"trunk/testing/gtest":
|
"trunk/testing/gtest":
|
||||||
From("trunk/chromium_deps", "src/testing/gtest"),
|
From("trunk/chromium_deps", "src/testing/gtest"),
|
||||||
|
|
||||||
"trunk/third_party/expat":
|
"trunk/third_party/expat":
|
||||||
Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/third_party/google-gflags/src":
|
"trunk/third_party/google-gflags/src":
|
||||||
(Var("googlecode_url") % "google-gflags") + "/trunk/src@45",
|
(Var("googlecode_url") % "google-gflags") + "/trunk/src@45",
|
||||||
|
|
||||||
"trunk/third_party/libjpeg":
|
"trunk/third_party/libjpeg":
|
||||||
Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/third_party/libjpeg_turbo":
|
"trunk/third_party/libjpeg_turbo":
|
||||||
From("trunk/chromium_deps", "src/third_party/libjpeg_turbo"),
|
From("trunk/chromium_deps", "src/third_party/libjpeg_turbo"),
|
||||||
|
|
||||||
"trunk/third_party/libvpx/source/libvpx":
|
"trunk/third_party/libvpx/source/libvpx":
|
||||||
"http://git.chromium.org/webm/libvpx.git@cab6ac16",
|
"http://git.chromium.org/webm/libvpx.git@cab6ac16",
|
||||||
|
|
||||||
"trunk/third_party/libyuv":
|
"trunk/third_party/libyuv":
|
||||||
(Var("googlecode_url") % "libyuv") + "/trunk@255",
|
(Var("googlecode_url") % "libyuv") + "/trunk@255",
|
||||||
|
|
||||||
"trunk/third_party/protobuf":
|
"trunk/third_party/protobuf":
|
||||||
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/third_party/yasm":
|
"trunk/third_party/yasm":
|
||||||
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/third_party/yasm/source/patched-yasm":
|
"trunk/third_party/yasm/source/patched-yasm":
|
||||||
From("trunk/chromium_deps", "src/third_party/yasm/source/patched-yasm"),
|
From("trunk/chromium_deps", "src/third_party/yasm/source/patched-yasm"),
|
||||||
|
|
||||||
"trunk/tools/clang":
|
"trunk/tools/clang":
|
||||||
Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/tools/gyp":
|
"trunk/tools/gyp":
|
||||||
From("trunk/chromium_deps", "src/tools/gyp"),
|
From("trunk/chromium_deps", "src/tools/gyp"),
|
||||||
|
|
||||||
"trunk/tools/python":
|
"trunk/tools/python":
|
||||||
Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/tools/valgrind":
|
"trunk/tools/valgrind":
|
||||||
Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"),
|
||||||
|
|
||||||
# Needed by build/common.gypi.
|
# Needed by build/common.gypi.
|
||||||
"trunk/tools/win/supalink":
|
"trunk/tools/win/supalink":
|
||||||
Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"),
|
||||||
}
|
}
|
||||||
|
|
||||||
deps_os = {
|
deps_os = {
|
||||||
"win": {
|
"win": {
|
||||||
# Use our own, stripped down, version of Cygwin (required by GYP).
|
# Use our own, stripped down, version of Cygwin (required by GYP).
|
||||||
"trunk/third_party/cygwin":
|
"trunk/third_party/cygwin":
|
||||||
(Var("googlecode_url") % "webrtc") + "/deps/third_party/cygwin",
|
(Var("googlecode_url") % "webrtc") + "/deps/third_party/cygwin",
|
||||||
|
|
||||||
# Used by libjpeg-turbo.
|
# Used by libjpeg-turbo.
|
||||||
"trunk/third_party/yasm/binaries":
|
"trunk/third_party/yasm/binaries":
|
||||||
From("trunk/chromium_deps", "src/third_party/yasm/binaries"),
|
From("trunk/chromium_deps", "src/third_party/yasm/binaries"),
|
||||||
},
|
},
|
||||||
"unix": {
|
"unix": {
|
||||||
"trunk/third_party/gold":
|
"trunk/third_party/gold":
|
||||||
From("trunk/chromium_deps", "src/third_party/gold"),
|
From("trunk/chromium_deps", "src/third_party/gold"),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
hooks = [
|
hooks = [
|
||||||
{
|
{
|
||||||
# Create a supplement.gypi file under trunk/src. This file will be picked
|
# Create a supplement.gypi file under trunk/src. This file will be picked
|
||||||
# up by gyp and used to enable the standalone build.
|
# up by gyp and used to enable the standalone build.
|
||||||
"pattern": ".",
|
"pattern": ".",
|
||||||
"action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/src/supplement.gypi"],
|
"action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/src/supplement.gypi"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
# Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
|
# 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.
|
# zero seconds to run. If something changed, it downloads a prebuilt clang.
|
||||||
"pattern": ".",
|
"pattern": ".",
|
||||||
"action": ["python", "trunk/tools/clang/scripts/update.py", "--mac-only"],
|
"action": ["python", "trunk/tools/clang/scripts/update.py", "--mac-only"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
# Download test resources, i.e. video and audio files. If the latest
|
# Download test resources, i.e. video and audio files. If the latest
|
||||||
# version is already downloaded, this takes zero seconds to run.
|
# version is already downloaded, this takes zero seconds to run.
|
||||||
# If a newer version or no current download exists, it will download
|
# If a newer version or no current download exists, it will download
|
||||||
# the resources and extract them.
|
# the resources and extract them.
|
||||||
"pattern": ".",
|
"pattern": ".",
|
||||||
"action": ["python", "trunk/tools/resources/update.py"],
|
"action": ["python", "trunk/tools/resources/update.py"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
||||||
"pattern": ".",
|
"pattern": ".",
|
||||||
"action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/webrtc.gyp"],
|
"action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/webrtc.gyp"],
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user