Repository: qpid-proton Updated Branches: refs/heads/master 092d41d44 -> 7fa2c88b4
PROTON-953: allow non-linux platforms to run setup.py Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/7fa2c88b Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/7fa2c88b Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/7fa2c88b Branch: refs/heads/master Commit: 7fa2c88b470eb79c1b2aaad989557ae7b2dedd04 Parents: 092d41d Author: Ken Giusti <kgiu...@apache.org> Authored: Thu Jul 30 14:27:45 2015 -0400 Committer: Ken Giusti <kgiu...@apache.org> Committed: Thu Jul 30 14:28:01 2015 -0400 ---------------------------------------------------------------------- proton-c/bindings/python/setup.py | 23 ++++++++--------------- proton-c/bindings/python/tox.ini | 2 -- 2 files changed, 8 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7fa2c88b/proton-c/bindings/python/setup.py ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/setup.py b/proton-c/bindings/python/setup.py index a577aeb..a845af9 100755 --- a/proton-c/bindings/python/setup.py +++ b/proton-c/bindings/python/setup.py @@ -321,21 +321,14 @@ class Configure(build_ext): _cproton.library_dirs.extend(ldirs.split()) def run(self): - # linux2 for python<2.7 - # linux4 for python<2.6 - if sys.platform in ['linux', 'linux2', 'linux4']: - if self.bundle_proton: - self.bundle_libqpid_proton_extension() - else: - self.use_installed_proton() - - # Do this just on linux since it's the only - # platform we support building the bundle for - # and especially, it's the only platform we check - # the, hopefully installed, qpid-proton version. - # This avoids re-using the distributed wrappers with - # uncompatible versions. - self.prepare_swig_wrap() + # check if the Proton library and headers are installed and are + # compatible with this version of the binding. + if self.bundle_proton: + # Proton not installed or compatible + self.bundle_libqpid_proton_extension() + else: + self.use_installed_proton() + self.prepare_swig_wrap() class CustomBuildOrder(build): http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7fa2c88b/proton-c/bindings/python/tox.ini ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/tox.ini b/proton-c/bindings/python/tox.ini index ef460e8..0a044e5 100644 --- a/proton-c/bindings/python/tox.ini +++ b/proton-c/bindings/python/tox.ini @@ -5,8 +5,6 @@ skipdist = True [testenv] usedevelop = False -#changedir = {toxinidir}/../../proton-c/include/ -platform = linux|linux2 setenv = VIRTUAL_ENV={envdir} PKG_CONFIG_PATH=None --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
