summaryrefslogtreecommitdiffstats
path: root/tools/scripts
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-09-09 15:55:59 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-09-10 13:02:06 +0200
commita4eb4ab50eab0ab91e6c4cacfc23232d6a0a2081 (patch)
treeaa45474284ddd770f84a79044e68ee47167c4267 /tools/scripts
parent65d149352d4062356c15dc496f738fe51f257557 (diff)
Prepare scripts for the .103 snapshot
Chromium is now relying on git for its releases and isn't creating release DEPS files anymore. This patch makes sure that we ignore any deps not starting with src/ to exclude the script repositories outside of the Chromium sources and it removes all the svn-related logic. Change-Id: I24b1839f919821382b8c5993c71251dbd6108d4f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/scripts')
-rw-r--r--tools/scripts/git_submodule.py20
-rw-r--r--tools/scripts/version_resolver.py46
2 files changed, 6 insertions, 60 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py
index a9002ffe..f3508eac 100644
--- a/tools/scripts/git_submodule.py
+++ b/tools/scripts/git_submodule.py
@@ -77,8 +77,9 @@ class DEPSParser:
subdir = dep
if subdir.startswith('src/'):
subdir = subdir[4:]
- if subdir.startswith('src'):
- # Ignore the information about chromium since we get that from git.
+ else:
+ # Ignore the information about chromium itself since we get that from git,
+ # also ignore anything outside src/ (e.g. depot_tools)
continue
submodule = Submodule(subdir, repo)
@@ -91,14 +92,10 @@ class DEPSParser:
if len(rev) == 40: # Length of a git shasum
submodule.shasum = rev
else:
- # Try to find out the git branch using the svn path.
+ # Try to find out the git branch.
branchMatch = re.search('/branches/((chromium/)?[^/]+)', repo)
- trunkMatch = re.search('/(trunk|svn)/', repo)
if branchMatch:
submodule.ref = 'refs/branch-heads/' + branchMatch.group(1)
- elif trunkMatch:
- submodule.ref = 'refs/heads/master'
- submodule.revision = int(rev)
submodules.append(submodule)
return submodules
@@ -118,7 +115,6 @@ class Submodule:
self.shasum = shasum
self.os = os
self.ref = ''
- self.revision = None
def matchesOS(self):
if not self.os:
@@ -153,12 +149,6 @@ class Submodule:
error = subprocessCall(['git', 'checkout', 'FETCH_HEAD']);
- if self.revision:
- search_string = 'git-svn-id:.*@%d' % self.revision
- line = subprocessCheckOutput(['git', 'log', '-n1', '--pretty=oneline', r'--grep=%s' % search_string])
- if line:
- self.shasum = line.split()[0]
-
current_shasum = subprocessCheckOutput(['git', 'rev-parse', 'HEAD']).strip()
current_tag = subprocessCheckOutput(['git', 'name-rev', '--tags', '--name-only', current_shasum]).strip()
@@ -249,8 +239,6 @@ class Submodule:
print 'DEPS file provides the following submodules:'
for submodule in submodules:
submodule_ref = submodule.shasum
- if submodule.revision:
- submodule_ref = submodule.ref + '@' + str(submodule.revision)
print '{:<80}'.format(submodule.path) + '{:<120}'.format(submodule.url) + submodule_ref
else: # Try .gitmodules since no ref has been specified
if not os.path.isfile('.gitmodules'):
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 0a9ed813..c28a422c 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -55,8 +55,6 @@ chromium_version = '37.0.2062.68'
chromium_branch = '2062'
json_url = 'http://omahaproxy.appspot.com/all.json'
-git_deps_url = 'http://src.chromium.org/chrome/branches/' + chromium_branch + '/src/.DEPS.git'
-base_deps_url = 'http://src.chromium.org/chrome/releases/'
qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
snapshot_src_dir = os.path.abspath(os.path.join(qtwebengine_root, 'src/3rdparty'))
@@ -88,33 +86,12 @@ def readReleaseChannels():
channels[os].append({ 'channel': ver['channel'], 'version': ver['version'], 'branch': ver['true_branch'] })
return channels
-def repositoryUrlFix(submodule):
- # The git repository info for webrtc is outdated in the 1750
- # branch's .DEPS.git file, so we have to update the url.
- # We should be able to remove this with a branch post 1750.
- repository_url = submodule.url
- if 'external/webrtc/stable' in repository_url:
- submodule.url = repository_url.replace('external/webrtc/stable', 'external/webrtc/trunk')
-
def sanityCheckModules(submodules):
submodule_dict = {}
sys.stdout.write('\nverifying submodule refs.')
for submodule in submodules:
sys.stdout.flush()
- if submodule.path in submodule_dict:
- prev_module = submodule_dict[submodule.path]
- # We might have to create our own DEPS file if different platforms use different branches,
- # but for now it should be safe to select the latest revision from the requirements.
- if submodule.shasum or prev_module.revision >= submodule.revision:
- continue
- if prev_module.ref != submodule.ref:
- # Ignore for Android which might lag behind.
- if submodule.os == 'android':
- continue
- sys.exit('ERROR: branch mismatch for ' + submodule.path + '(' + prev_module.ref + ' vs ' + submodule.ref + ')')
- print('Duplicate submodule ' + submodule.path + '. Using latest revison ' + str(submodule.revision) + '.')
if submodule.ref:
- repositoryUrlFix(submodule)
sys.stdout.write('.')
result = subprocess.check_output(['git', 'ls-remote', submodule.url, submodule.ref])
if submodule.ref not in result:
@@ -127,34 +104,15 @@ def sanityCheckModules(submodules):
return list(submodule_dict.values())
def readSubmodules():
- response = urllib2.urlopen(base_deps_url + chromium_version + '/DEPS')
- svn_deps = response.read().strip()
-
- response = urllib2.urlopen(git_deps_url)
- git_deps = response.read().strip()
+ git_deps = subprocess.check_output(['git', 'show', chromium_version +':.DEPS.git'])
parser = GitSubmodule.DEPSParser()
- svn_submodules = parser.parse(svn_deps)
git_submodules = parser.parse(git_deps)
submodule_dict = {}
- git_dict = {}
for sub in git_submodules:
- git_dict[sub.path] = sub
-
- for sub in svn_submodules:
- if (sub.revision or sub.shasum) and sub.path in git_dict:
- submodule_dict[sub.path] = sub
-
- for git in git_submodules:
- if git.path in submodule_dict:
- # We'll use the git repository instead of svn.
- module = submodule_dict[git.path]
- module.url = git.url
- if not module.shasum:
- # We use the git shasum as fallback.
- module.shasum = git.shasum
+ submodule_dict[sub.path] = sub
# Remove unwanted upstream submodules
for path in submodule_blacklist: