diff options
| author | Joel Sherrill <joel@rtems.org> | 2016-10-27 18:03:34 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2016-10-27 18:03:34 -0500 |
| commit | be428d186c55f6377e3fd62d97b6275f22561979 (patch) | |
| tree | ec09e0f04a7b0f5415b7484574f0e5604bf2bd68 /common | |
| parent | Clean up the CPU Supplement. (diff) | |
| download | rtems-docs-be428d186c55f6377e3fd62d97b6275f22561979.tar.bz2 | |
common/waf.py: Improve Sphinx version parsing to work with their git master
Diffstat (limited to 'common')
| -rw-r--r-- | common/waf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/waf.py b/common/waf.py index 0178def..d7a46c1 100644 --- a/common/waf.py +++ b/common/waf.py @@ -1,4 +1,4 @@ -import sys, os +import sys, os, re from waflib.Build import BuildContext sphinx_min_version = (1,3) @@ -53,7 +53,7 @@ class linkcheck(BuildContext): def check_sphinx_version(ctx, minver): version = ctx.cmd_and_log(ctx.env.BIN_SPHINX_BUILD + ['--version']).split(" ")[-1:][0].strip() try: - ver = tuple(map(int, version.split("."))) + ver = tuple(map(int, re.split('[\D]', version))) except: ctx.fatal("Sphinx version cannot be checked: %s" % version) if ver < minver: |