[rtems commit] common/waf.py: Improve Sphinx version parsing to work with their git master
Joel Sherrill
joel at rtems.org
Thu Oct 27 23:03:44 UTC 2016
Module: rtems
Branch: master
Commit: be428d186c55f6377e3fd62d97b6275f22561979
Changeset: http://git.rtems.org/rtems/commit/?id=be428d186c55f6377e3fd62d97b6275f22561979
Author: Joel Sherrill <joel at rtems.org>
Date: Thu Oct 27 18:03:34 2016 -0500
common/waf.py: Improve Sphinx version parsing to work with their git master
---
common/waf.py | 4 ++--
1 file 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:
More information about the vc
mailing list