Merge revision 855 changes:

- Fix location of VERSION files in make_distrib.py.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1271@856 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-10-11 20:46:40 +00:00
parent e7a0355a3c
commit 4e62a86ad6

View File

@ -176,8 +176,8 @@ date = get_date()
# Read and parse the version file (key=value pairs, one per line)
args = {}
read_version_file('VERSION', args)
read_version_file('../chrome/VERSION', args)
read_version_file(os.path.join(cef_dir, 'VERSION'), args)
read_version_file(os.path.join(cef_dir, '../chrome/VERSION'), args)
cef_ver = args['CEF_MAJOR']+'.'+args['BUILD']+'.'+cef_rev
chromium_ver = args['MAJOR']+'.'+args['MINOR']+'.'+args['BUILD']+'.'+args['PATCH']