- Removed the proton binary from qpid-proton-c. - Added the perl-qpid-proton subpackage.epel9
Darryl L. Pierce
10 years ago
parent
34ea54b1a1
commit
b29d8d6327
@ -0,0 +1,32 @@
|
||||
From fc37fa00539906cac2f0639c166fb233e826fe7e Mon Sep 17 00:00:00 2001
|
||||
From: "Darryl L. Pierce" <mcpierce@gmail.com>
|
||||
Date: Mon, 16 Mar 2015 09:15:22 -0400
|
||||
Subject: [PATCH 1/2] NO-JIRA: Fix install of Perl bindings
|
||||
|
||||
---
|
||||
proton-c/bindings/perl/CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/proton-c/bindings/perl/CMakeLists.txt b/proton-c/bindings/perl/CMakeLists.txt
|
||||
index 9891c09..55cf032 100644
|
||||
--- a/proton-c/bindings/perl/CMakeLists.txt
|
||||
+++ b/proton-c/bindings/perl/CMakeLists.txt
|
||||
@@ -56,13 +56,13 @@ swig_link_libraries(cproton_perl ${BINDING_DEPS} ${PERL_LIBRARY})
|
||||
|
||||
if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.so
|
||||
- DESTINATION ${PERL_VENDORARCH_DIR}
|
||||
+ DESTINATION ${PERL_VENDORARCH_DIR}/auto/cproton_perl
|
||||
COMPONENT Perl
|
||||
)
|
||||
else()
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcproton_perl.so
|
||||
RENAME cproton_perl.so
|
||||
- DESTINATION ${PERL_VENDORARCH_DIR}
|
||||
+ DESTINATION ${PERL_VENDORARCH_DIR}/auto/cproton_perl
|
||||
COMPONENT Perl
|
||||
)
|
||||
endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From a0670dd53c9d3b444656917e0b663364f6f20aa5 Mon Sep 17 00:00:00 2001
|
||||
From: "Darryl L. Pierce" <mcpierce@gmail.com>
|
||||
Date: Mon, 27 Oct 2014 15:01:52 -0400
|
||||
Subject: [PATCH] PROTON-731: Installing Python requires Proton be installed
|
||||
already.
|
||||
|
||||
The CHECK_SYSINSTALL_PYTHON variable was not being set, so it's now
|
||||
being set by default but can be overridden from the command line.
|
||||
|
||||
Also changed the PYTHON_SITEARCH_PACKAGES variable a cache done that can
|
||||
also be overridden from the command line as well.
|
||||
---
|
||||
proton-c/bindings/python/CMakeLists.txt | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt
|
||||
index b8cdb57..ff8c706 100644
|
||||
--- a/proton-c/bindings/python/CMakeLists.txt
|
||||
+++ b/proton-c/bindings/python/CMakeLists.txt
|
||||
@@ -22,6 +22,8 @@
|
||||
|
||||
set(CMAKE_SWIG_FLAGS "-threads")
|
||||
|
||||
+set(CHECK_SYSINSTALL_PYTHON ON CACHE INTERNAL "")
|
||||
+
|
||||
include_directories (${PYTHON_INCLUDE_PATH})
|
||||
if (BUILD_WITH_CXX)
|
||||
SET_SOURCE_FILES_PROPERTIES(cproton.i PROPERTIES CPLUSPLUS ON)
|
||||
@@ -74,7 +76,7 @@ if (CHECK_SYSINSTALL_PYTHON)
|
||||
|
||||
else ()
|
||||
# install the bindings using the CMAKE path variables:
|
||||
- set (PYTHON_SITEARCH_PACKAGES ${BINDINGS_DIR}/python)
|
||||
+ set (PYTHON_SITEARCH_PACKAGES ${BINDINGS_DIR}/python CACHE INTERNAL "")
|
||||
|
||||
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cproton.py
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -0,0 +1,73 @@
|
||||
From ba8cee70089adfe64c2429a20eb5bee90d96b606 Mon Sep 17 00:00:00 2001
|
||||
From: "Darryl L. Pierce" <mcpierce@gmail.com>
|
||||
Date: Tue, 17 Mar 2015 09:04:31 -0400
|
||||
Subject: [PATCH 2/2] PROTON-582: Added in missing is_float method to Perl
|
||||
bindings.
|
||||
|
||||
---
|
||||
examples/perl/messenger/send.pl | 2 +-
|
||||
proton-c/bindings/perl/lib/qpid/proton/Data.pm | 4 ++--
|
||||
proton-c/bindings/perl/lib/qpid/proton/Message.pm | 2 +-
|
||||
proton-c/bindings/perl/lib/qpid/proton/utils.pm | 7 +++++++
|
||||
4 files changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/examples/perl/messenger/send.pl b/examples/perl/messenger/send.pl
|
||||
index b622b68..27893ce 100755
|
||||
--- a/examples/perl/messenger/send.pl
|
||||
+++ b/examples/perl/messenger/send.pl
|
||||
@@ -59,7 +59,7 @@ foreach (@messages)
|
||||
{
|
||||
$msg->set_address($address);
|
||||
$msg->set_subject($subject);
|
||||
- $msg->set_content($content);
|
||||
+ $msg->set_body($content);
|
||||
# try a few different body types
|
||||
my $body_type = int(rand(6));
|
||||
$msg->set_property("sent", "" . localtime(time));
|
||||
diff --git a/proton-c/bindings/perl/lib/qpid/proton/Data.pm b/proton-c/bindings/perl/lib/qpid/proton/Data.pm
|
||||
index 156e09a..494a8f3 100644
|
||||
--- a/proton-c/bindings/perl/lib/qpid/proton/Data.pm
|
||||
+++ b/proton-c/bindings/perl/lib/qpid/proton/Data.pm
|
||||
@@ -1165,8 +1165,8 @@ sub put_list_helper {
|
||||
$self->enter;
|
||||
|
||||
for my $value (@{$array}) {
|
||||
- if (qpid::proton::is_num($value)) {
|
||||
- if (qpid::proton::is_float($value)) {
|
||||
+ if (qpid::proton::utils::is_num($value)) {
|
||||
+ if (qpid::proton::utils::is_float($value)) {
|
||||
$self->put_float($value);
|
||||
} else {
|
||||
$self->put_int($value);
|
||||
diff --git a/proton-c/bindings/perl/lib/qpid/proton/Message.pm b/proton-c/bindings/perl/lib/qpid/proton/Message.pm
|
||||
index b36caa7..0251b89 100644
|
||||
--- a/proton-c/bindings/perl/lib/qpid/proton/Message.pm
|
||||
+++ b/proton-c/bindings/perl/lib/qpid/proton/Message.pm
|
||||
@@ -438,7 +438,7 @@ sub set_body {
|
||||
# be, which is going to be a best guess
|
||||
if (!defined($body_type)) {
|
||||
if (qpid::proton::utils::is_num($body)) {
|
||||
- if (qpid::proton::is_float($body)) {
|
||||
+ if (qpid::proton::utils::is_float($body)) {
|
||||
$body_type = qpid::proton::FLOAT;
|
||||
} else {
|
||||
$body_type = qpid::proton::INT;
|
||||
diff --git a/proton-c/bindings/perl/lib/qpid/proton/utils.pm b/proton-c/bindings/perl/lib/qpid/proton/utils.pm
|
||||
index 5652535..0ab4e3e 100644
|
||||
--- a/proton-c/bindings/perl/lib/qpid/proton/utils.pm
|
||||
+++ b/proton-c/bindings/perl/lib/qpid/proton/utils.pm
|
||||
@@ -28,4 +28,11 @@ sub is_num {
|
||||
$_[0] ^ $_[0] ? 0 : 1
|
||||
}
|
||||
|
||||
+sub is_float {
|
||||
+ my $val = $_[0];
|
||||
+
|
||||
+ return 1 if ($val - int($val));
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
1;
|
||||
--
|
||||
2.1.0
|
||||
|
||||
Loading…
Reference in new issue