| OLD | NEW |
| 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/' |
| 11 webkit_git = GIT_HOST + 'chromium/blink.git' | 11 webkit_git = GIT_HOST + 'chromium/blink.git' |
| 12 | 12 |
| 13 # Remove the ffmpeg overrides, since the buildspec DEPS have stripped out these | 13 # Remove the ffmpeg overrides, since the buildspec DEPS have stripped out these |
| 14 # (and other) vars that they don't use, and without them in the DEPS, deps2git | 14 # (and other) vars that they don't use, and without them in the DEPS, deps2git |
| 15 # complains about missing vars. | 15 # complains about missing vars. |
| 16 DEPS_OVERRIDES = { | 16 DEPS_OVERRIDES = { |
| 17 'src/third_party/ffmpeg': None | 17 'src/third_party/ffmpeg': None |
| 18 } | 18 } |
| 19 | 19 |
| 20 | 20 |
| 21 # pylint: disable=W0613 | 21 # pylint: disable=W0613 |
| 22 def CleanDeps(deps, deps_os, include_rules, skip_child_includes, hooks, | 22 def CleanDeps(deps, deps_os, include_rules, skip_child_includes, hooks): |
| 23 svn_deps_vars): | |
| 24 global webkit_git | 23 global webkit_git |
| 25 webkit_rev = None | 24 webkit_rev = None |
| 26 for os, deps_section in ([(None, deps)] + | 25 for os, deps_section in ([(None, deps)] + |
| 27 [(os, deps_os[os]) for os in deps_os]): | 26 [(os, deps_os[os]) for os in deps_os]): |
| 28 del_deps = [] | 27 del_deps = [] |
| 29 add_deps = {} | 28 add_deps = {} |
| 30 for dep, dep_url in deps_section.iteritems(): | 29 for dep, dep_url in deps_section.iteritems(): |
| 31 # Skip 'None' exclusion entries. | 30 # Skip 'None' exclusion entries. |
| 32 if not dep_url: | 31 if not dep_url: |
| 33 continue | 32 continue |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 if match.group('path'): | 224 if match.group('path'): |
| 226 repo = GIT_HOST + 'chromium/blink-public.git' | 225 repo = GIT_HOST + 'chromium/blink-public.git' |
| 227 else: | 226 else: |
| 228 repo = GIT_HOST + 'chromium/blink.git' | 227 repo = GIT_HOST + 'chromium/blink.git' |
| 229 return (path, repo, GIT_HOST, match.group('branch')) | 228 return (path, repo, GIT_HOST, match.group('branch')) |
| 230 | 229 |
| 231 # reference builds | 230 # reference builds |
| 232 if svn_url.startswith('/trunk/deps/reference_builds/chrome'): | 231 if svn_url.startswith('/trunk/deps/reference_builds/chrome'): |
| 233 return (path, GIT_HOST + 'chromium/reference_builds/chrome.git', | 232 return (path, GIT_HOST + 'chromium/reference_builds/chrome.git', |
| 234 GIT_HOST) | 233 GIT_HOST) |
| OLD | NEW |