Add support to check_revision.py for building release branches (issue #325).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@432 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-12-20 16:35:15 +00:00
parent 59d7310ac7
commit 6b195a8739
1 changed files with 37 additions and 10 deletions

View File

@ -34,7 +34,8 @@ if not options.quiet:
cef_info['url']+"\n") cef_info['url']+"\n")
# Retrieve the Chromium SVN info. # Retrieve the Chromium SVN info.
chromium_info = get_svn_info(os.path.join(cef_dir, os.pardir)) src_dir = os.path.join(cef_dir, os.pardir)
chromium_info = get_svn_info(src_dir)
if not options.quiet: if not options.quiet:
sys.stdout.write('Using Chromium revision '+chromium_info['revision']+' @ '+\ sys.stdout.write('Using Chromium revision '+chromium_info['revision']+' @ '+\
chromium_info['url']+"\n") chromium_info['url']+"\n")
@ -45,6 +46,32 @@ config = eval(read_file(compat_file), {'__builtins__': None}, None)
error = False error = False
if 'release_url' in config:
current_release_url = None
path = os.path.join(os.path.join(src_dir, os.pardir), '.gclient')
if os.path.exists(path):
# read the .gclient file
fp = open(path, 'r')
data = fp.read()
fp.close()
# Parse the contents
config_dict = {}
try:
exec(data, config_dict)
current_release_url = config_dict['solutions'][0]['url']
except Exception, e:
sys.stderr.write('Failed to parse existing .glient file.\n')
raise
if not options.quiet:
sys.stdout.write('Using Chromium release '+current_release_url+"\n")
if current_release_url != config['release_url']:
error = True
sys.stderr.write("\nWARNING: Incorrect Chromium release URL; found "+\
current_release_url+', expected '+config['release_url']+"\n")
else:
if chromium_info['url'] != config['chromium_url']: if chromium_info['url'] != config['chromium_url']:
error = True error = True
sys.stderr.write("\nWARNING: Incorrect Chromium URL; found "+\ sys.stderr.write("\nWARNING: Incorrect Chromium URL; found "+\