diff options
| author | Rene Schneider <slartie@posteo.de> | 2019-04-24 17:07:46 +0000 |
|---|---|---|
| committer | Marshall Greenblatt <magreenblatt@gmail.com> | 2019-04-24 17:07:46 +0000 |
| commit | 4efdff29d50ee8f6813fa696940922df40b0953a (patch) | |
| tree | e8970b1289f0d095e1bf0afaeaf1ae2ad1736cdb /tools | |
| parent | 9f354b60dc81da0919b5e688e6ff18c6f3f4a49b (diff) | |
| download | jcef-4efdff29d50ee8f6813fa696940922df40b0953a.tar.gz | |
Update to the new CEF versioning scheme (CEF issue 2596)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/make_readme.py | 5 | ||||
| -rw-r--r-- | tools/make_version_header.py | 2 | ||||
| -rw-r--r-- | tools/readme_util.py | 12 |
3 files changed, 12 insertions, 7 deletions
diff --git a/tools/make_readme.py b/tools/make_readme.py index 8f59e89..ef3bfb1 100644 --- a/tools/make_readme.py +++ b/tools/make_readme.py @@ -129,8 +129,9 @@ if not git.is_checkout(jcef_dir): jcef_commit_number = git.get_commit_number(jcef_dir) jcef_commit_hash = git.get_hash(jcef_dir) jcef_url = git.get_url(jcef_dir) -jcef_ver = '%s.%s.%s.g%s' % (args['CEF_MAJOR'], args['CEF_BUILD'], - jcef_commit_number, jcef_commit_hash[:7]) +jcef_ver = '%s.%s.%s.%s+g%s' % (args['CEF_MAJOR'], args['CEF_MINOR'], + args['CEF_PATCH'], jcef_commit_number, + jcef_commit_hash[:7]) date = get_date() diff --git a/tools/make_version_header.py b/tools/make_version_header.py index ada2c6d..7f2c7b4 100644 --- a/tools/make_version_header.py +++ b/tools/make_version_header.py @@ -72,7 +72,7 @@ def write_svn_header(header): args = {} read_readme_file(os.path.join(options.cefpath, 'README.txt'), args) - version = '%s.%s.%s.g%s' % (args['CEF_MAJOR'], args['CEF_BUILD'], + version = '%s.%s.%s.%s+g%s' % (args['CEF_MAJOR'], args['CEF_MINOR'], args['CEF_PATCH'], commit_number, commit_hash[:7]) newcontents = '// Copyright (c) '+year+' The Chromium Embedded Framework Authors. All rights\n'+\ diff --git a/tools/readme_util.py b/tools/readme_util.py index e46ca21..dc01966 100644 --- a/tools/readme_util.py +++ b/tools/readme_util.py @@ -9,11 +9,15 @@ def read_readme_file(file, args): if len(parts) != 2: continue if parts[0].startswith('CEF Version'): - args['CEF_VER'] = parts[1].strip() - verparts = args['CEF_VER'].split('.') - if len(verparts) >= 2: + args['CEF_VER'] = parts[1].strip(); + subparts = parts[1].split('+'); + if len(subparts) != 3: + raise Exception('Failed to parse CEF Version: %s' % parts[1]) + verparts = subparts[0].strip().split('.') + if len(verparts) >= 3: args['CEF_MAJOR'] = verparts[0] - args['CEF_BUILD'] = verparts[1] + args['CEF_MINOR'] = verparts[1] + args['CEF_PATCH'] = verparts[2] elif parts[0].startswith('CEF URL'): args['CEF_URL'] = parts[1].strip() elif parts[0].startswith('Chromium Version'): |