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

Side by Side Diff: buildspec_to_git.py

Issue 492413003: Add handling for mapping new libvpx branch location. (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/deps2git
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """Public buildspec to GIT mapping.""" 5 """Public buildspec to GIT mapping."""
6 6
7 import re 7 import re
8 from deps2git import SplitScmUrl 8 from deps2git import SplitScmUrl
9 9
10 GIT_HOST = 'https://chromium.googlesource.com/' 10 GIT_HOST = 'https://chromium.googlesource.com/'
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 match.groupdict().get('branch')) 135 match.groupdict().get('branch'))
136 else: 136 else:
137 return (path, GIT_HOST + 'chromium/src.git', GIT_HOST) 137 return (path, GIT_HOST + 'chromium/src.git', GIT_HOST)
138 138
139 # libvpx branches in the chrome branches area. 139 # libvpx branches in the chrome branches area.
140 match = re.match('/branches/libvpx/(?P<branch>[^/]+)', svn_url) 140 match = re.match('/branches/libvpx/(?P<branch>[^/]+)', svn_url)
141 if match: 141 if match:
142 return (path, GIT_HOST + 'chromium/deps/libvpx.git', GIT_HOST, 142 return (path, GIT_HOST + 'chromium/deps/libvpx.git', GIT_HOST,
143 match.group('branch')) 143 match.group('branch'))
144 144
145 # New location of libvpx branches.
146 match = re.match('/branches/(?P<branch>[^/]+)/deps/third_party/libvpx',
147 svn_url)
148 if match:
149 return (path, GIT_HOST + 'chromium/deps/libvpx.git', GIT_HOST,
150 match.group('branch'))
151
145 # Since the ffmpeg overrides are gone, we can't use the upstream git repo 152 # Since the ffmpeg overrides are gone, we can't use the upstream git repo
146 # (which is what those overrides referenced), so use the mirror of the svn 153 # (which is what those overrides referenced), so use the mirror of the svn
147 # repo. 154 # repo.
148 if svn_url == '/trunk/deps/third_party/ffmpeg': 155 if svn_url == '/trunk/deps/third_party/ffmpeg':
149 return (path, GIT_HOST + 'chromium/deps/ffmpeg.git', GIT_HOST) 156 return (path, GIT_HOST + 'chromium/deps/ffmpeg.git', GIT_HOST)
150 157
151 match = re.match('/branches/ffmpeg/(?P<branch>[^/]+)', svn_url) 158 match = re.match('/branches/ffmpeg/(?P<branch>[^/]+)', svn_url)
152 if match: 159 if match:
153 return (path, GIT_HOST + 'chromium/deps/ffmpeg.git', GIT_HOST, 160 return (path, GIT_HOST + 'chromium/deps/ffmpeg.git', GIT_HOST,
154 match.group('branch')) 161 match.group('branch'))
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 236
230 # reference builds 237 # reference builds
231 # TODO(mmoss): This is no longer appropriate for current buildspecs, where 238 # TODO(mmoss): This is no longer appropriate for current buildspecs, where
232 # each platform has its own repo, as defined in git_updater. Not sure if 239 # each platform has its own repo, as defined in git_updater. Not sure if
233 # there's a way to detect and handle the current and the old repo configs at 240 # there's a way to detect and handle the current and the old repo configs at
234 # the same time. Turning off for now, since we care more about current 241 # the same time. Turning off for now, since we care more about current
235 # configs. 242 # configs.
236 #if svn_url.startswith('/trunk/deps/reference_builds/chrome'): 243 #if svn_url.startswith('/trunk/deps/reference_builds/chrome'):
237 # return (path, GIT_HOST + 'chromium/reference_builds/chrome.git', 244 # return (path, GIT_HOST + 'chromium/reference_builds/chrome.git',
238 # GIT_HOST) 245 # GIT_HOST)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698