diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-30 18:21:32 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-30 18:21:32 +0000 |
| commit | 3a00901d0029291c99b3dec9e452f75d6889d5f6 (patch) | |
| tree | ffb4e17103ec926b1cd62671eea40fa9dc5fe185 /webkit | |
| parent | 376bc0c68d0eef158d872dc16741fae048ffb223 (diff) | |
| download | chromium_src-3a00901d0029291c99b3dec9e452f75d6889d5f6.zip chromium_src-3a00901d0029291c99b3dec9e452f75d6889d5f6.tar.gz chromium_src-3a00901d0029291c99b3dec9e452f75d6889d5f6.tar.bz2 | |
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
Diffstat (limited to 'webkit')
| -rwxr-xr-x | webkit/tools/merge/merge.py | 14 |
1 files changed, 4 insertions, 10 deletions
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) |