Modify DEPS so that it works properly for the buildbot

git-svn-id: http://skia.googlecode.com/svn/trunk@1570 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/DEPS b/DEPS
index 5524f39..571b83c 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -1,14 +1,11 @@
-hooks = [
-  {
-    # This is a hack to download the code in third_party/externals in gclient
-    # (it works fine without this hack when you use svn instead of gclient).
-    #
-    # Because gclient runs svn update with the --ignore_externals flag set,
-    # it will not pick up our external dependencies in third_party/externals.
-    # So run "svn update" again for these directories.
-    #
-    # See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/1f99541c2c5f6c6e
-    "pattern": ".*",
-    "action": ["svn", "update", "trunk/third_party/externals"],
-  },
-]
+# Dependencies on outside packages, as needed for developers/bots that use
+# "gclient" instead of raw SVN access.
+#
+# For now, this must be maintained in parallel with "SVN externals"
+# dependencies for developers who use raw SVN instead of "gclient".
+# See third_party/externals/README
+
+use_relative_paths = True
+deps = {
+  "third_party/externals/gyp" : "http://gyp.googlecode.com/svn/trunk@930",
+}

diff --git a/third_party/externals/README b/third_party/externals/README
index 344ee29..9b613be 100644 (file)
--- a/third_party/externals/README
+++ b/third_party/externals/README
@@ -11,12 +11,6 @@ See http://svnbook.red-bean.com/en/1.5/svn.advanced.externals.html for
 more info.
 
 
-NOTE: We have disabled our use of these external dependencies, for now, because
-they will fail for anyone using gclient to check out the skia code.  (As of
-early 2011, gclient passes --ignore-externals when calling svn update.)  See
-http://code.google.com/p/skia/issues/detail?id=291 and
-https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/1f99541c2c5f6c6e
-
-Leaving this directory (and unused external dependency on gyp) in place until
-we figure out the long-term solution.  We may start using it again, or replace with
-DEPS, or ???
+NOTE: This set of dependencies must be manually kept in sync with the gclient
+DEPS; the output of "svn propget svn:externals ." should always be equivalent
+to the content of the "DEPS" file within trunk.