From 4e62a86ad6992f30ba29d9430c182cd45a847a1a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 11 Oct 2012 20:46:40 +0000 Subject: [PATCH] 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 --- cef3/tools/make_distrib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cef3/tools/make_distrib.py b/cef3/tools/make_distrib.py index 404b9b99b..5b8018ccf 100644 --- a/cef3/tools/make_distrib.py +++ b/cef3/tools/make_distrib.py @@ -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']