From 1ad026d2bdb3260065aaf38a12791d16a0b73ef0 Mon Sep 17 00:00:00 2001 From: Gustavo Carneiro Date: Sun, 26 Jul 2015 14:01:43 +0100 Subject: [PATCH] Update to get pybindgen from github, with new version scheme --- bindings/python/wscript | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/bindings/python/wscript b/bindings/python/wscript index 245691a9b..e8822d8ff 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -12,8 +12,8 @@ from waflib.Errors import WafError # feature = TaskGen.feature # after = TaskGen.after -## https://launchpad.net/pybindgen/ -REQUIRED_PYBINDGEN_VERSION = (0, 17, 0, 887) +# https://github.com/gjcarneiro/pybindgen +REQUIRED_PYBINDGEN_VERSION = '0.17.0.post41+ngd10fa60' REQUIRED_PYGCCXML_VERSION = (0, 9, 5) RUN_ME=-3 @@ -165,15 +165,13 @@ def configure(conf): else: out = subprocess.Popen([conf.env['PYTHON'][0], "-c", "import pybindgen.version; " - "print('.'.join([str(x) for x in pybindgen.version.__version__]))"], + "print(pybindgen.__version__)"], stdout=subprocess.PIPE).communicate()[0] - pybindgen_version_str = out.strip() - pybindgen_version = tuple([int(x) for x in pybindgen_version_str.split('.')]) - conf.msg('Checking for pybindgen version', pybindgen_version_str) + pybindgen_version = out.strip() + conf.msg('Checking for pybindgen version', pybindgen_version) if not (pybindgen_version == REQUIRED_PYBINDGEN_VERSION): - Logs.warn("pybindgen (found %s), (need %s)" % - (pybindgen_version_str, - '.'.join([str(x) for x in REQUIRED_PYBINDGEN_VERSION]))) + Logs.warn("pybindgen (found %r), (need %r)" % + (pybindgen_version, REQUIRED_PYBINDGEN_VERSION)) conf.report_optional_feature("python", "Python Bindings", False, "PyBindGen version not correct and newer version could not be retrieved") return