Use http (not https) to sync jsoncpp.
This is mainly to be consistent with the other repos, but there's also a slim chance it's triggering an issue on the buildbot Review URL: http://webrtc-codereview.appspot.com/154005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@604 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
parent
ce95069ade
commit
29f9159ad7
176
DEPS
176
DEPS
@ -1,88 +1,88 @@
|
|||||||
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",
|
||||||
"webrtc_trunk" : "https://webrtc.googlecode.com/svn/trunk",
|
"webrtc_trunk" : "https://webrtc.googlecode.com/svn/trunk",
|
||||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
||||||
"chromium_revision": "98568",
|
"chromium_revision": "98568",
|
||||||
"libjingle_revision": "77",
|
"libjingle_revision": "77",
|
||||||
}
|
}
|
||||||
|
|
||||||
# NOTE: Prefer revision numbers to tags.
|
# NOTE: Prefer revision numbers to tags.
|
||||||
deps = {
|
deps = {
|
||||||
"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/gtest":
|
"trunk/testing/gtest":
|
||||||
(Var("googlecode_url") % "googletest") + "/trunk@573",
|
(Var("googlecode_url") % "googletest") + "/trunk@573",
|
||||||
|
|
||||||
"trunk/testing/gmock":
|
"trunk/testing/gmock":
|
||||||
(Var("googlecode_url") % "googlemock") + "/trunk@386",
|
(Var("googlecode_url") % "googlemock") + "/trunk@386",
|
||||||
|
|
||||||
"trunk/tools/gyp":
|
"trunk/tools/gyp":
|
||||||
(Var("googlecode_url") % "gyp") + "/trunk@1012",
|
(Var("googlecode_url") % "gyp") + "/trunk@1012",
|
||||||
|
|
||||||
"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"),
|
||||||
|
|
||||||
# TODO(andrew): return to the webm git repository when possible.
|
# TODO(andrew): return to the webm git repository when possible.
|
||||||
"trunk/third_party/libvpx/source/libvpx":
|
"trunk/third_party/libvpx/source/libvpx":
|
||||||
Var("chromium_trunk") + "/deps/third_party/libvpx/source/libvpx@98040",
|
Var("chromium_trunk") + "/deps/third_party/libvpx/source/libvpx@98040",
|
||||||
#"git://review.webmproject.org/libvpx.git@v0.9.7-p1",
|
#"git://review.webmproject.org/libvpx.git@v0.9.7-p1",
|
||||||
|
|
||||||
"trunk/third_party/libjpeg_turbo/":
|
"trunk/third_party/libjpeg_turbo/":
|
||||||
Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@95800",
|
Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@95800",
|
||||||
|
|
||||||
"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/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/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/libjingle/":
|
"trunk/third_party/libjingle/":
|
||||||
Var("chromium_trunk") + "/src/third_party/libjingle@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/third_party/libjingle@" + 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/libjingle/source":
|
"trunk/third_party/libjingle/source":
|
||||||
(Var("googlecode_url") % "libjingle") + "/trunk@" + Var("libjingle_revision"),
|
(Var("googlecode_url") % "libjingle") + "/trunk@" + Var("libjingle_revision"),
|
||||||
|
|
||||||
"trunk/third_party/yasm/source/patched-yasm":
|
"trunk/third_party/yasm/source/patched-yasm":
|
||||||
Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761",
|
Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761",
|
||||||
# Used by libjpeg-turbo
|
# Used by libjpeg-turbo
|
||||||
"trunk/third_party/yasm/binaries":
|
"trunk/third_party/yasm/binaries":
|
||||||
Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228",
|
Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228",
|
||||||
|
|
||||||
"trunk/third_party/jsoncpp/":
|
"trunk/third_party/jsoncpp/":
|
||||||
"https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@246",
|
"http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@246",
|
||||||
}
|
}
|
||||||
|
|
||||||
deps_os = {
|
deps_os = {
|
||||||
"win": {
|
"win": {
|
||||||
"trunk/third_party/cygwin/":
|
"trunk/third_party/cygwin/":
|
||||||
Var("chromium_trunk") + "/deps/third_party/cygwin@66844",
|
Var("chromium_trunk") + "/deps/third_party/cygwin@66844",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hooks = [
|
hooks = [
|
||||||
{
|
{
|
||||||
# Create a supplement.gypi file under trunk/. This file will be picked up
|
# Create a supplement.gypi file under trunk/. This file will be picked up
|
||||||
# by gyp and we use it to set Chromium related variables (inside_chromium_build)
|
# by gyp and we use it to set Chromium related variables (inside_chromium_build)
|
||||||
# to 0 and enable the standalone build.
|
# to 0 and 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"],
|
||||||
},
|
},
|
||||||
# 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