Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: DEPS

Issue 208037: Added command buffer unit tests to gyp.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
===================================================================
--- DEPS (revision 26702)
+++ DEPS (working copy)
@@ -1,111 +1,150 @@
vars = {
- "chromium_trunk":
- "http://src.chromium.org/svn/trunk",
+ "chromium_trunk": "http://src.chromium.org/svn/trunk",
"nixysa_rev": "54",
- "chromium_rev": "22547",
- "o3d_code_rev": "147",
- "skia_rev": "279",
- "gyp_rev": "606",
+ "chromium_rev": "26261",
+ "o3d_code_rev": "145",
+ "skia_rev": "341",
+ "gyp_rev": "651",
"gtest_rev": "267",
"gflags_rev": "30",
- "breakpad_rev": "346",
- "v8_rev": "2624",
+ "breakpad_rev": "391",
+ "v8_rev": "2866",
+ "icu_rev": "25717",
+ "nacl_rev": "569",
}
deps = {
"o3d/o3d_assets":
"http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_code_rev"),
- "o3d/third_party/antlr3":
+ "third_party/antlr3":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var("o3d_code_rev"),
- "o3d/third_party/cg":
+ "third_party/cg":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3d_code_rev"),
- "o3d/third_party/chrome":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/chrome@" + Var("o3d_code_rev"),
-
- "o3d/third_party/fcollada":
+ "third_party/fcollada":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + Var("o3d_code_rev"),
- "o3d/third_party/glew":
+ "third_party/glew":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/glew@" + Var("o3d_code_rev"),
- "o3d/third_party/icu38":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/icu38@" + Var("o3d_code_rev"),
-
- "o3d/third_party/jpeg":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jpeg@" + Var("o3d_code_rev"),
-
- "o3d/third_party/jsdoctoolkit":
+ "third_party/jsdoctoolkit":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"),
- "o3d/third_party/libevent":
+ "third_party/libevent":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/libevent@" + Var("o3d_code_rev"),
- "o3d/third_party/pdiff":
+ "third_party/pdiff":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"),
- "o3d/third_party/png":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/png@" + Var("o3d_code_rev"),
-
- "o3d/third_party/scons":
+ "third_party/scons":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var("o3d_code_rev"),
- "o3d/third_party/selenium_rc":
+ "third_party/vectormath":
+ "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" + Var("o3d_code_rev"),
+
+ "third_party/zip_utils":
+ "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" + Var("o3d_code_rev"),
+
+ "third_party/selenium_rc":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@" + Var("o3d_code_rev"),
- "o3d/third_party/skia":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/skia/files@" + Var("o3d_code_rev"),
+# Stuff from the Chromium tree.
- "o3d/third_party/vectormath":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" + Var("o3d_code_rev"),
+ "third_party/harfbuzz":
+ Var("chromium_trunk") + "/src/third_party/harfbuzz@" + Var("chromium_rev"),
- "o3d/third_party/wix_2_0_4221":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"),
+ "third_party/icu":
+ Var("chromium_trunk") + "/deps/third_party/icu42@" + Var("icu_rev"),
- "o3d/third_party/zip_utils":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" + Var("o3d_code_rev"),
+ "third_party/libevent":
+ Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"),
- "o3d/third_party/zlib":
- "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zlib@" + Var("o3d_code_rev"),
+ "third_party/libjpeg":
+ Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_rev"),
- "o3d/third_party/v8":
+ "third_party/libpng":
+ Var("chromium_trunk") + "/src/third_party/libpng@" + Var("chromium_rev"),
+
+ "chrome/third_party/wtl":
+ Var("chromium_trunk") + "/src/chrome/third_party/wtl@" + Var("chromium_rev"),
+
+ "third_party/zlib":
+ Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"),
+
+ "third_party/skia":
+ "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"),
+
+ "v8":
"http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"),
- # NACL has to be in this weird directory because it looks for
- # googleclient two levels above it.
- "o3d/third_party/native_client/googleclient/native_client":
- "http://nativeclient.googlecode.com/svn/trunk/nacl/googleclient/native_client@188",
+ "testing":
+ Var("chromium_trunk") + "/src/testing@" + Var("chromium_rev"),
- "o3d/third_party/breakpad":
+ "skia":
+ Var("chromium_trunk") + "/src/skia@" + Var("chromium_rev"),
+
+ "breakpad":
+ Var("chromium_trunk") + "/src/breakpad@" + Var("chromium_rev"),
+
+ "base":
+ Var("chromium_trunk") + "/src/base@" + Var("chromium_rev"),
+
+ "native_client":
+ "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" + Var("nacl_rev"),
+
+ "breakpad/src":
"http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"),
- "o3d/third_party/nixysa":
+ "third_party/nixysa":
"http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"),
- "o3d/third_party/npapi":
+ "third_party/npapi":
"http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_rev"),
- "o3d/third_party/ply":
+ "third_party/ply":
"http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_rev"),
- "o3d/third_party/gflags/":
+ "third_party/gflags":
"http://google-gflags.googlecode.com/svn/trunk@" + Var("gflags_rev"),
- "o3d/third_party/gtest/files":
+ "testing/gtest":
"http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"),
- "o3d/third_party/gmock/files":
+ "testing/gmock":
Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"),
+ # Stuff needed for GYP to run
+ "build":
+ Var("chromium_trunk") + "/src/build@" + Var("chromium_rev"),
+
"tools/gyp":
"http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"),
}
deps_os = {
"win": {
- "o3d/third_party/python_24":
+ "third_party/wix_2_0_4221":
+ "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"),
+
+ "third_party/cygwin":
+ "/trunk/deps/third_party/cygwin@11984",
+
+ "third_party/python_24":
Var("chromium_trunk") + "/deps/third_party/python_24@19441",
},
+ "unix": {
+ # Linux, really.
+ "site_scons":
+ Var("chromium_trunk") + "/src/site_scons@" + Var("chromium_rev"),
+ },
}
+
+hooks = [
+ {
+ # A change to a .gyp, .gypi, or to GYP itself should run the generator.
+ "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\\\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$",
+ "action": ["python", "o3d/build/gyp_o3d", "o3d/build/all.gyp"],
+ },
+]
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698