Auto merge of #4287 - ebfull:update-proton, r=ebfull
Update proton from 0.26.0 to 0.30.0
This commit is contained in:
commit
3a18c95042
|
@ -1,8 +1,8 @@
|
|||
package=proton
|
||||
$(package)_version=0.26.0
|
||||
$(package)_version=0.30.0
|
||||
$(package)_download_path=https://archive.apache.org/dist/qpid/proton/$($(package)_version)
|
||||
$(package)_file_name=qpid-proton-$($(package)_version).tar.gz
|
||||
$(package)_sha256_hash=0eddac870f0085b9aeb0c9da333bd3f53fedb7c872164171a7cc06761ddbbd75
|
||||
$(package)_sha256_hash=e37fd8fb13391c3996f927839969a8f66edf35612392d0611eeac6e39e48dd33
|
||||
$(package)_patches=minimal-build.patch
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.txt
|
||||
--- qpid-proton-0.26.0/c/CMakeLists.txt 2018-10-04 04:09:02.000000000 -0600
|
||||
+++ qpid-proton-patched/c/CMakeLists.txt 2019-03-25 17:32:41.521213312 -0600
|
||||
@@ -443,15 +443,15 @@
|
||||
${qpid-proton-include-generated}
|
||||
)
|
||||
diff -ur a/c/CMakeLists.txt b/c/CMakeLists.txt
|
||||
--- a/c/CMakeLists.txt 2019-12-09 07:17:00.000000000 -0700
|
||||
+++ b/c/CMakeLists.txt 2019-12-19 18:17:15.038784335 -0700
|
||||
@@ -432,14 +432,14 @@
|
||||
target_compile_options (qpid-proton-core-objects PRIVATE $<TARGET_PROPERTY:qpid-proton-core,COMPILE_OPTIONS>)
|
||||
target_include_directories(qpid-proton-core-objects PRIVATE $<TARGET_PROPERTY:qpid-proton-core,INCLUDE_DIRECTORIES>)
|
||||
|
||||
-add_library (qpid-proton-core SHARED ${qpid-proton-core-src})
|
||||
-add_dependencies (qpid-proton-core generated_c_files)
|
||||
-add_library (qpid-proton-core SHARED $<TARGET_OBJECTS:qpid-proton-core-objects>)
|
||||
-target_link_libraries (qpid-proton-core ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS})
|
||||
-set_target_properties (qpid-proton-core
|
||||
- PROPERTIES
|
||||
|
@ -14,8 +13,7 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
|
|||
- SOVERSION "${PN_LIB_CORE_MAJOR_VERSION}"
|
||||
- LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
|
||||
-)
|
||||
+#add_library (qpid-proton-core SHARED ${qpid-proton-core-src})
|
||||
+#add_dependencies (qpid-proton-core generated_c_files)
|
||||
+#add_library (qpid-proton-core SHARED $<TARGET_OBJECTS:qpid-proton-core-objects>)
|
||||
+#target_link_libraries (qpid-proton-core ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS})
|
||||
+#set_target_properties (qpid-proton-core
|
||||
+# PROPERTIES
|
||||
|
@ -26,11 +24,11 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
|
|||
|
||||
if (BUILD_STATIC_LIBS)
|
||||
add_library (qpid-proton-core-static STATIC ${qpid-proton-core-src})
|
||||
@@ -472,14 +472,14 @@
|
||||
@@ -454,14 +454,14 @@
|
||||
${qpid-proton-include-extra}
|
||||
)
|
||||
|
||||
-add_library (qpid-proton SHARED ${qpid-proton-src})
|
||||
-add_library (qpid-proton SHARED $<TARGET_OBJECTS:qpid-proton-core-objects> ${qpid-proton-noncore-src})
|
||||
-target_link_libraries (qpid-proton LINK_PRIVATE ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
|
||||
-set_target_properties (qpid-proton
|
||||
- PROPERTIES
|
||||
|
@ -38,7 +36,7 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
|
|||
- SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}"
|
||||
- LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
|
||||
-)
|
||||
+#add_library (qpid-proton SHARED ${qpid-proton-src})
|
||||
+# add_library (qpid-proton SHARED $<TARGET_OBJECTS:qpid-proton-core-objects> ${qpid-proton-noncore-src})
|
||||
+# target_link_libraries (qpid-proton LINK_PRIVATE ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
|
||||
+# set_target_properties (qpid-proton
|
||||
+# PROPERTIES
|
||||
|
@ -48,8 +46,8 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
|
|||
+# )
|
||||
|
||||
if (BUILD_STATIC_LIBS)
|
||||
add_library(qpid-proton-static STATIC ${qpid-proton-src})
|
||||
@@ -500,15 +500,15 @@
|
||||
add_library(qpid-proton-static STATIC ${qpid-proton-core-src} ${qpid-proton-noncore-src})
|
||||
@@ -482,15 +482,15 @@
|
||||
|
||||
if (qpid-proton-proactor)
|
||||
set(HAS_PROACTOR True)
|
||||
|
@ -74,16 +72,24 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
|
|||
if (BUILD_STATIC_LIBS)
|
||||
add_library (qpid-proton-proactor-static STATIC ${qpid-proton-proactor})
|
||||
endif(BUILD_STATIC_LIBS)
|
||||
@@ -518,7 +518,7 @@
|
||||
@@ -500,11 +500,11 @@
|
||||
if (BUILD_STATIC_LIBS)
|
||||
set(STATIC_LIBS qpid-proton-static qpid-proton-core-static)
|
||||
endif()
|
||||
-install(TARGETS qpid-proton qpid-proton-core ${STATIC_LIBS}
|
||||
+install(TARGETS ${STATIC_LIBS}
|
||||
EXPORT proton
|
||||
RUNTIME DESTINATION bin
|
||||
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
||||
@@ -538,11 +538,11 @@
|
||||
- EXPORT proton
|
||||
- RUNTIME DESTINATION bin
|
||||
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
||||
- LIBRARY DESTINATION ${LIB_INSTALL_DIR})
|
||||
+# install(TARGETS qpid-proton qpid-proton-core ${STATIC_LIBS}
|
||||
+# EXPORT proton
|
||||
+# RUNTIME DESTINATION bin
|
||||
+# ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
||||
+# LIBRARY DESTINATION ${LIB_INSTALL_DIR})
|
||||
|
||||
# Install windows pdb files
|
||||
if (MSVC)
|
||||
@@ -520,11 +520,11 @@
|
||||
if (BUILD_STATIC_LIBS)
|
||||
set(STATIC_LIBS qpid-proton-proactor-static)
|
||||
endif()
|
||||
|
@ -100,7 +106,7 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
|
|||
|
||||
# Install windows pdb files
|
||||
if (MSVC)
|
||||
@@ -594,10 +594,10 @@
|
||||
@@ -576,10 +576,10 @@
|
||||
${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake
|
||||
DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton)
|
||||
|
||||
|
@ -115,10 +121,10 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
|
|||
|
||||
install (DIRECTORY examples/
|
||||
DESTINATION "${PROTON_SHARE}/examples/c"
|
||||
diff -ur qpid-proton-0.26.0/CMakeLists.txt qpid-proton-patched/CMakeLists.txt
|
||||
--- qpid-proton-0.26.0/CMakeLists.txt 2018-10-04 04:09:02.000000000 -0600
|
||||
+++ qpid-proton-patched/CMakeLists.txt 2019-03-25 17:32:41.521213312 -0600
|
||||
@@ -24,22 +24,22 @@
|
||||
diff -ur a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2019-12-09 07:17:00.000000000 -0700
|
||||
+++ b/CMakeLists.txt 2019-12-19 18:11:57.128248724 -0700
|
||||
@@ -24,7 +24,7 @@
|
||||
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tools/cmake/Modules")
|
||||
set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
|
||||
|
||||
|
@ -127,16 +133,13 @@ diff -ur qpid-proton-0.26.0/CMakeLists.txt qpid-proton-patched/CMakeLists.txt
|
|||
include (CheckLanguage)
|
||||
include (CheckLibraryExists)
|
||||
include (CheckSymbolExists)
|
||||
include (CheckPythonModule)
|
||||
|
||||
-find_package (OpenSSL)
|
||||
+#find_package (OpenSSL)
|
||||
@@ -33,13 +33,13 @@
|
||||
find_package (OpenSSL)
|
||||
find_package (Threads)
|
||||
find_package (PythonInterp REQUIRED)
|
||||
-find_package (SWIG)
|
||||
-find_package (CyrusSASL)
|
||||
+# find_package (SWIG)
|
||||
+#find_package (CyrusSASL)
|
||||
find_package (CyrusSASL)
|
||||
|
||||
-enable_testing ()
|
||||
+#enable_testing ()
|
||||
|
@ -147,7 +150,7 @@ diff -ur qpid-proton-0.26.0/CMakeLists.txt qpid-proton-patched/CMakeLists.txt
|
|||
|
||||
## Variables used across components
|
||||
|
||||
@@ -272,7 +272,7 @@
|
||||
@@ -260,7 +260,7 @@
|
||||
|
||||
set (SYSINSTALL_BINDINGS OFF CACHE BOOL "If SYSINSTALL_BINDINGS is OFF then proton bindings will be installed underneath ${BINDINGS_DIR} and each user will need to modify their interpreter configuration to load the appropriate binding. If SYSINSTALL_BINDINGS is ON, then each language interpreter will be queried for the appropriate directory and proton bindings will be installed and available system wide with no additional per user configuration.")
|
||||
|
||||
|
@ -156,7 +159,7 @@ diff -ur qpid-proton-0.26.0/CMakeLists.txt qpid-proton-patched/CMakeLists.txt
|
|||
|
||||
foreach (LANG ${BINDING_LANGS})
|
||||
set (SYSINSTALL_${LANG} OFF CACHE BOOL "Install ${LANG} bindings into interpreter specified location.")
|
||||
@@ -327,7 +327,7 @@
|
||||
@@ -315,7 +315,7 @@
|
||||
endif()
|
||||
|
||||
# Prerequisites for Go
|
||||
|
@ -165,10 +168,10 @@ diff -ur qpid-proton-0.26.0/CMakeLists.txt qpid-proton-patched/CMakeLists.txt
|
|||
mark_as_advanced(GO_EXE)
|
||||
if (GO_EXE)
|
||||
set (DEFAULT_GO ON)
|
||||
diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeLists.txt
|
||||
--- qpid-proton-0.26.0/cpp/CMakeLists.txt 2018-10-04 04:09:02.000000000 -0600
|
||||
+++ qpid-proton-patched/cpp/CMakeLists.txt 2019-03-25 17:32:41.521213312 -0600
|
||||
@@ -174,25 +174,25 @@
|
||||
diff -ur a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
--- a/cpp/CMakeLists.txt 2019-12-09 07:17:00.000000000 -0700
|
||||
+++ b/cpp/CMakeLists.txt 2019-12-19 18:13:35.410474818 -0700
|
||||
@@ -174,30 +174,30 @@
|
||||
set (CMAKE_DEBUG_POSTFIX "d")
|
||||
endif ()
|
||||
|
||||
|
@ -176,6 +179,7 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
|
|||
+# add_library(qpid-proton-cpp SHARED ${qpid-proton-cpp-source})
|
||||
if(BUILD_STATIC_LIBS)
|
||||
add_library(qpid-proton-cpp-static STATIC ${qpid-proton-cpp-source})
|
||||
set(STATIC_LIBS qpid-proton-cpp-static)
|
||||
endif(BUILD_STATIC_LIBS)
|
||||
|
||||
-target_link_libraries (qpid-proton-cpp LINK_PRIVATE ${PLATFORM_LIBS} qpid-proton-core qpid-proton-proactor ${CONNECT_CONFIG_LIBS})
|
||||
|
@ -200,12 +204,20 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
|
|||
|
||||
## Install
|
||||
|
||||
-install(TARGETS qpid-proton-cpp
|
||||
+install(TARGETS qpid-proton-cpp-static
|
||||
EXPORT proton-cpp
|
||||
RUNTIME DESTINATION bin
|
||||
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
||||
@@ -208,12 +208,12 @@
|
||||
-install(TARGETS qpid-proton-cpp ${STATIC_LIBS}
|
||||
- EXPORT proton-cpp
|
||||
- RUNTIME DESTINATION bin
|
||||
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
||||
- LIBRARY DESTINATION ${LIB_INSTALL_DIR})
|
||||
+# install(TARGETS qpid-proton-cpp ${STATIC_LIBS}
|
||||
+# EXPORT proton-cpp
|
||||
+# RUNTIME DESTINATION bin
|
||||
+# ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
||||
+# LIBRARY DESTINATION ${LIB_INSTALL_DIR})
|
||||
|
||||
# Install windows qpid-proton-cpp pdb files
|
||||
if (MSVC)
|
||||
@@ -209,12 +209,12 @@
|
||||
|
||||
install (DIRECTORY "include/proton" DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.hpp")
|
||||
install (FILES "${CMAKE_CURRENT_BINARY_DIR}/config_presets.hpp" DESTINATION "${INCLUDE_INSTALL_DIR}/proton/internal")
|
||||
|
@ -223,7 +235,7 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
|
|||
add_subdirectory(docs)
|
||||
|
||||
# Pkg config file
|
||||
@@ -267,28 +267,28 @@
|
||||
@@ -268,31 +268,31 @@
|
||||
set(test_env ${test_env} "PATH=$<TARGET_FILE_DIR:qpid-proton>")
|
||||
endif()
|
||||
|
||||
|
@ -242,9 +254,9 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
|
|||
-add_cpp_test(scalar_test)
|
||||
-add_cpp_test(value_test)
|
||||
-add_cpp_test(container_test)
|
||||
-add_cpp_test(url_test)
|
||||
-add_cpp_test(reconnect_test)
|
||||
-add_cpp_test(link_test)
|
||||
-add_cpp_test(credit_test)
|
||||
-if (ENABLE_JSONCPP)
|
||||
- add_cpp_test(connect_config_test)
|
||||
- target_link_libraries(connect_config_test qpid-proton-core) # For pn_sasl_enabled
|
||||
|
@ -267,9 +279,9 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
|
|||
+# add_cpp_test(scalar_test)
|
||||
+# add_cpp_test(value_test)
|
||||
+# add_cpp_test(container_test)
|
||||
+#add_cpp_test(url_test)
|
||||
+# add_cpp_test(reconnect_test)
|
||||
+# add_cpp_test(link_test)
|
||||
+# add_cpp_test(credit_test)
|
||||
+# if (ENABLE_JSONCPP)
|
||||
+# add_cpp_test(connect_config_test)
|
||||
+# target_link_libraries(connect_config_test qpid-proton-core) # For pn_sasl_enabled
|
||||
|
@ -277,23 +289,6 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
|
|||
+# # Test data and output directories for connect_config_test
|
||||
+# file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/testdata" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
|
||||
+# endif()
|
||||
diff -ur qpid-proton-0.26.0/cpp/include/proton/url.hpp qpid-proton-patched/cpp/include/proton/url.hpp
|
||||
--- qpid-proton-0.26.0/cpp/include/proton/url.hpp 2018-10-04 04:09:02.000000000 -0600
|
||||
+++ qpid-proton-patched/cpp/include/proton/url.hpp 2019-03-25 17:33:50.956058757 -0600
|
||||
@@ -40,7 +40,6 @@
|
||||
/// An error encountered during URL parsing.
|
||||
|
||||
struct
|
||||
-PN_CPP_DEPRECATED("Use a third-party URL library")
|
||||
PN_CPP_CLASS_EXTERN url_error : public error {
|
||||
/// @cond INTERNAL
|
||||
/// Construct a URL error with a message.
|
||||
@@ -62,7 +61,7 @@
|
||||
///
|
||||
/// - Path is normally used as a link source or target address. On a
|
||||
/// broker it typically corresponds to a queue or topic name.
|
||||
-class PN_CPP_DEPRECATED("Use a third-party URL library") url {
|
||||
+class url {
|
||||
public:
|
||||
static const std::string AMQP; ///< "amqp" prefix
|
||||
static const std::string AMQPS; ///< "amqps" prefix
|
||||
# TODO aconway 2018-10-31: Catch2 tests
|
||||
# This is a simple example of a C++ test using the Catch2 framework.
|
||||
|
|
Loading…
Reference in New Issue