Repository: qpid-proton Updated Branches: refs/heads/0.12.x 5dc39f8fc -> de397c5fc
PROTON-1118: use CMakeLists.txt to determine the location of sources for the python binding Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/de397c5f Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/de397c5f Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/de397c5f Branch: refs/heads/0.12.x Commit: de397c5fc1c1957aa257d93a05e586e966217b9b Parents: 5dc39f8 Author: Ken Giusti <[email protected]> Authored: Mon Feb 1 11:53:22 2016 -0500 Committer: Ken Giusti <[email protected]> Committed: Tue Feb 2 11:46:48 2016 -0500 ---------------------------------------------------------------------- proton-c/bindings/python/setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/de397c5f/proton-c/bindings/python/setup.py ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/setup.py b/proton-c/bindings/python/setup.py index db9bfca..8c815cd 100755 --- a/proton-c/bindings/python/setup.py +++ b/proton-c/bindings/python/setup.py @@ -147,18 +147,18 @@ class Configure(build_ext): # be used to override where this setup gets the Proton C sources from # (see bundle.fetch_libqpid_proton()) if 'QPID_PROTON_SRC' not in os.environ: - if not os.path.exists(os.path.join(setup_path, 'tox.ini')): + if not os.path.exists(os.path.join(setup_path, 'CMakeLists.txt')): bundledir = os.path.join(base, "bundled") if not os.path.exists(bundledir): os.makedirs(bundledir) bundle.fetch_libqpid_proton(bundledir) libqpid_proton_dir = os.path.abspath(os.path.join(bundledir, 'qpid-proton')) else: - # This should happen just in **dev** environemnts since - # tox.ini is not shipped with the driver. It should only - # be triggered when calling `setup.py`. This can happen either - # manually or when calling `tox` in the **sdist** step. Tox will - # defined the `QPID_PROTON_SRC` itself. + # setup.py is being invoked from within the proton source tree + # (CMakeLists.txt is not present in the python source dist). + # In this case build using the local sources. This use case is + # specifically for developers working on the proton source + # code. proton_c = os.path.join(setup_path, '..', '..', '..') libqpid_proton_dir = os.path.abspath(proton_c) else: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
