Use Vars for the webkit repo and revision number. This way

we can override the via custom_vars in .gclient on the bots
and official builds.

Also pulls JavaScriptCore from webkit.org and updates
the merge script appropriately.

This is blocked on http://code.google.com/p/gclient/source/detail?r=41
being checked in an pushed.
Review URL: http://codereview.chromium.org/19690

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8969 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 13 deletions

diff --git a/DEPS b/DEPS
index f6c0f38..f59bef7 100644
--- a/DEPS
+++ b/DEPS
@@ -1,3 +1,10 @@
+vars = {
+  "webkit_trunk":
+    "http://svn.webkit.org/repository/webkit/trunk",
+  "webkit_revision": "40364",
+}
+
+
 deps = {
   "src/breakpad/src":
     "http://google-breakpad.googlecode.com/svn/trunk/src@285",
@@ -21,13 +28,13 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@1181",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40364",
+    Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
 
   "src/third_party/WebKit/WebKit":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKit@40364",
+    Var("webkit_trunk") + "/WebKit@" + Var("webkit_revision"),
 
   "src/third_party/WebKit/WebKitLibraries":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40364",
+    Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
 }
 
 
diff --git a/webkit/tools/merge/merge.py b/webkit/tools/merge/merge.py
index a395a42..e5067c1 100755
--- a/webkit/tools/merge/merge.py
+++ b/webkit/tools/merge/merge.py
@@ -22,12 +22,6 @@ import xml.dom.minidom
 
 import google.path_utils
 
-DEPS_PATHS_TO_UPDATE = [
-  "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@",
-  "http://svn.webkit.org/repository/webkit/trunk/WebKit@",
-  "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@",
-]
-
 class Merger(object):
   """ Does svn merges. """
 
@@ -116,9 +110,9 @@ def UpdateWebKitMergeRevision(webkit_merge_revision_path, repository,
 
 def UpdateDeps(deps_path, new_revision, is_dry_run):
   contents = open(deps_path).read()
-  for path in DEPS_PATHS_TO_UPDATE:
-    pattern = re.compile(path + "\d+", re.MULTILINE)
-    contents = pattern.sub(path + str(new_revision), contents)
+  path = '"webkit_revision": "'
+  pattern = re.compile(path + "\d+")
+  contents = pattern.sub(path + str(new_revision), contents)
   if is_dry_run:
     print "%s=%s" % (deps_path, contents)
   else:
@@ -161,8 +155,8 @@ def main(options, args):
 
   merger = Merger(repository, webkit_root, old_revision, new_revision,
       options.dry_run, options.svn, options.diff3_tool)
-  merger.MergeDirectory("JavaScriptCore")
   merger.MergeDirectory("WebCore")
+  merger.MergeDirectory("JavaScriptCore")
 
   UpdateWebKitMergeRevision(webkit_merge_revision_path, repository,
       new_revision, options.dry_run)