You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2023/01/31 20:29:29 UTC
[qpid-proton] branch main updated (6ae2654a4 -> 833bf2ffa)
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
from 6ae2654a4 PROTON-2657: Fix an issue found by Coverity
new e0f919365 PROTON-2095: Fix language binding documentation
new b1dc4d874 PROTON-2678: Mark the created CFFI package as multiversion
new 833bf2ffa PROTON-2095: Change the Python build dependencies
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
INSTALL.md | 54 ++++++++++++++++++++++-----------------------------
python/CMakeLists.txt | 10 +++++-----
2 files changed, 28 insertions(+), 36 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-proton] 02/03: PROTON-2678: Mark the created CFFI package as multiversion
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit b1dc4d8746ac95dde2f69a81566082ee30f606bd
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Tue Jan 31 15:24:22 2023 -0500
PROTON-2678: Mark the created CFFI package as multiversion
We were already building a multiversion package as that is what cffi
does by default. We just needed to tell bdist_wheel to create the
correct file name.
---
python/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 6dbd4866d..bae2873a2 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -148,7 +148,7 @@ check_python_module("wheel" WHEEL_MODULE_FOUND)
if (SETUPTOOLS_MODULE_FOUND)
set (pydist_cmds sdist)
if (WHEEL_MODULE_FOUND)
- set (pydist_cmds sdist bdist_wheel)
+ set (pydist_cmds sdist bdist_wheel --py-limited-api=cp38)
endif()
endif()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-proton] 03/03: PROTON-2095: Change the Python build dependencies
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit 833bf2ffa8796a313e5c43c4276229eddeb0affd
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Tue Jan 31 15:25:49 2023 -0500
PROTON-2095: Change the Python build dependencies
This should hopefully avoid mutliple custom target trying to build the
same custom commands in parallel and failing. We chieve this by making
the custom targets serialised.
---
python/CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index bae2873a2..4711ff046 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -154,10 +154,10 @@ endif()
if (pydist_cmds)
add_custom_command(OUTPUT .timestamp.dist
- DEPENDS .timestamp.copied_pysrc ${pysrc_files}
- COMMAND ${CMAKE_COMMAND} -E remove -f .timestamp.dist
- COMMAND ${Python_EXECUTABLE} setup.py ${pydist_cmds}
- COMMAND ${CMAKE_COMMAND} -E touch .timestamp.dist)
+ DEPENDS .timestamp.cproton_ffi
+ COMMAND ${CMAKE_COMMAND} -E remove -f .timestamp.dist
+ COMMAND ${Python_EXECUTABLE} setup.py ${pydist_cmds}
+ COMMAND ${CMAKE_COMMAND} -E touch .timestamp.dist)
add_custom_target(pydist ALL DEPENDS .timestamp.dist)
endif ()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-proton] 01/03: PROTON-2095: Fix language binding documentation
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit e0f919365459c69f9a783b790e359b6835a54198
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Tue Jan 31 15:15:39 2023 -0500
PROTON-2095: Fix language binding documentation
The Proton Python binding now only builds package files. This is now
reflected in the docs.
The Ruby binding changed long ago but the docs were unchanged at that
time, this has no been fixed.
Also updated the instructions for newer versions of Visual Studio.
---
INSTALL.md | 54 +++++++++++++++++++++++-------------------------------
1 file changed, 23 insertions(+), 31 deletions(-)
diff --git a/INSTALL.md b/INSTALL.md
index 0538ca39e..e7152eb68 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -45,7 +45,7 @@ language.
$ yum install cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-md5
# Dependencies needed for bindings
- $ yum install swig # Required for all bindings
+ $ yum install swig # Required for ruby binding
$ yum install python-devel # Python
$ yum install ruby-devel rubygem-minitest # Ruby
$ yum install jsoncpp-devel # C++ optional config file
@@ -82,7 +82,7 @@ From the directory where you found this `INSTALL.md` file:
# Set the install prefix. You may need to adjust it depending on your
# system.
- $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DSYSINSTALL_BINDINGS=ON
+ $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
# Omit the docs target if you do not wish to build or install
# documentation.
@@ -107,20 +107,20 @@ Studio and used to build the Proton library.
The following packages must be installed:
- - Visual Studio 2015 or newer (regular or C++ Express)
+ - Visual Studio 2017 or newer (Community or Enterprise Editions)
- Python (www.python.org)
- CMake (www.cmake.org)
-Additional packages are required for the language bindings:
+Additional packages are required for language bindings:
- - Swig (www.swig.org)
+ - Swig (www.swig.org) for the ruby bindings
- Development headers and libraries for the language of choice
Notes:
- Be sure to install relevant Microsoft Service Packs and updates
- python.exe, cmake.exe and swig.exe _must_ all be added to your PATH
- - Chocolatey is a useful tool that can be used to install cmake, python
- and swig (see https://chocolatey.org/)
+ - Chocolatey or scoop are useful tools that can be used to install cmake, python
+ and swig (see https://chocolatey.org/ or https://scoop.sh/)
To generate the Visual Studio project files, from the directory where you found
this `INSTALL.md` file:
@@ -131,7 +131,15 @@ this `INSTALL.md` file:
If CMake doesn't guess things correctly, useful additional arguments are:
- -G "Visual Studio 10"
+ -G "Visual Studio 15 2017"
+or
+
+ -G "Visual Studio 16 2019"
+or
+
+ -G "Visual Studio 17 2022"
+and
+
-DSWIG_EXECUTABLE=C:\swigwin-2.0.7\swig.exe
Refer to the CMake documentation for more information.
@@ -167,33 +175,17 @@ but if you wish you can use it instead of the default native IO:
Installing Language Bindings
----------------------------
-Most dynamic languages provide a way for asking where to install
-libraries in order to place them in a default search path.
-
-When `SYSINSTALL_BINDINGS` is enabled (`ON`), the
-`CMAKE_INSTALL_PREFIX` does not affect the location for where the
-language bindings (Python and Ruby) are installed. For those
-elements, the location is determined by the language interpreter
-itself; that is, each interpreter is queried for the proper location
-for extensions.
-
-When `SYSINSTALL_BINDINGS` is disabled (`OFF`), Proton installs all
-dynamic language bindings into a central, default location:
-
- BINDINGS=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/proton/bindings
+For the Python and Ruby language bindings the primary product is a package file that can be installed with the language specific package manager.
-In order to use these bindings, you'll need to configure your
-interpreter to load the bindings from the appropriate directory.
+### Python
+The built python packages will be found in the `python/dist` sub-directory of the build directory. They can be installed into an instance of python by using a comand like:
- - Python - Add ${BINDINGS}/python to PYTHONPATH
- - Ruby - Add ${BINDINGS}/ruby to RUBYLIB
+ > python -m pip install python/dist/python_qpid_proton-0.39.0-cp311-cp311-linux_x86_64.whl
-You can configure the build to install a specific binding to the
-location specified by the system interpreter with the
-SYSINSTALL_[LANGUAGE] options, where [LANGUAGE] is one of PYTHON
-or RUBY.
+### Ruby
+The built ruby gem can be found in the `ruby/gem` sub-directory of the build directory. It can be installed into a ruby installation by using a command like:
- $ cmake .. -DSYSINSTALL_PYTHON=ON
+ > gem install ruby/gem/qpid_proton-0.39.0.gem
Disabling Language Bindings
---------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org