zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #4287 - ebfull:update-proton, r=ebfull 

Update proton from 0.26.0 to 0.30.0
This commit is contained in:
Homu 2020-01-08 01:26:26 +00:00
parent 043ce3f2ac a5affb11d1
commit 3a18c95042
2 changed files with 133 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
depends/packages/proton.mk
View File

@ -1,8 +1,8 @@
package=proton 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)_download_path=https://archive.apache.org/dist/qpid/proton/$($(package)_version)
$(package)_file_name=qpid-proton-$($(package)_version).tar.gz $(package)_file_name=qpid-proton-$($(package)_version).tar.gz
$(package)_sha256_hash=0eddac870f0085b9aeb0c9da333bd3f53fedb7c872164171a7cc06761ddbbd75 $(package)_sha256_hash=e37fd8fb13391c3996f927839969a8f66edf35612392d0611eeac6e39e48dd33
$(package)_patches=minimal-build.patch $(package)_patches=minimal-build.patch
define $(package)_preprocess_cmds define $(package)_preprocess_cmds

261
depends/patches/proton/minimal-build.patch
View File

@ -1,12 +1,11 @@
diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.txt diff -ur a/c/CMakeLists.txt b/c/CMakeLists.txt
--- qpid-proton-0.26.0/c/CMakeLists.txt 2018-10-04 04:09:02.000000000 -0600 --- a/c/CMakeLists.txt 2019-12-09 07:17:00.000000000 -0700
+++ qpid-proton-patched/c/CMakeLists.txt 2019-03-25 17:32:41.521213312 -0600 +++ b/c/CMakeLists.txt 2019-12-19 18:17:15.038784335 -0700
@@ -443,15 +443,15 @@ @@ -432,14 +432,14 @@
${qpid-proton-include-generated} 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_library (qpid-proton-core SHARED $<TARGET_OBJECTS:qpid-proton-core-objects>)
-add_dependencies (qpid-proton-core generated_c_files)
-target_link_libraries (qpid-proton-core ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS}) -target_link_libraries (qpid-proton-core ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS})
-set_target_properties (qpid-proton-core -set_target_properties (qpid-proton-core
- PROPERTIES - 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}" - SOVERSION "${PN_LIB_CORE_MAJOR_VERSION}"
- LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" - LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
-) -)
+#add_library (qpid-proton-core SHARED ${qpid-proton-core-src}) +#add_library (qpid-proton-core SHARED $<TARGET_OBJECTS:qpid-proton-core-objects>)
+#add_dependencies (qpid-proton-core generated_c_files)
+#target_link_libraries (qpid-proton-core ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS}) +#target_link_libraries (qpid-proton-core ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS})
+#set_target_properties (qpid-proton-core +#set_target_properties (qpid-proton-core
+# PROPERTIES +# 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) if (BUILD_STATIC_LIBS)
add_library (qpid-proton-core-static STATIC ${qpid-proton-core-src}) add_library (qpid-proton-core-static STATIC ${qpid-proton-core-src})
@@ -472,14 +472,14 @@ @@ -454,14 +454,14 @@
${qpid-proton-include-extra} ${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}) -target_link_libraries (qpid-proton LINK_PRIVATE ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
-set_target_properties (qpid-proton -set_target_properties (qpid-proton
- PROPERTIES - PROPERTIES
@ -38,18 +36,18 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
- SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}" - SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}"
- LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" - 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}) +# target_link_libraries (qpid-proton LINK_PRIVATE ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
+#set_target_properties (qpid-proton +# set_target_properties (qpid-proton
+# PROPERTIES +# PROPERTIES
+# VERSION "${PN_LIB_LEGACY_VERSION}" +# VERSION "${PN_LIB_LEGACY_VERSION}"
+# SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}" +# SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}"
+# LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" +# LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
+#) +# )
if (BUILD_STATIC_LIBS) if (BUILD_STATIC_LIBS)
add_library(qpid-proton-static STATIC ${qpid-proton-src}) add_library(qpid-proton-static STATIC ${qpid-proton-core-src} ${qpid-proton-noncore-src})
@@ -500,15 +500,15 @@ @@ -482,15 +482,15 @@
if (qpid-proton-proactor) if (qpid-proton-proactor)
set(HAS_PROACTOR True) set(HAS_PROACTOR True)
@ -62,28 +60,36 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
- SOVERSION "${PN_LIB_PROACTOR_MAJOR_VERSION}" - SOVERSION "${PN_LIB_PROACTOR_MAJOR_VERSION}"
- LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" - LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
- ) - )
+ #add_library (qpid-proton-proactor SHARED ${qpid-proton-proactor}) + # add_library (qpid-proton-proactor SHARED ${qpid-proton-proactor})
+ #target_link_libraries (qpid-proton-proactor LINK_PUBLIC qpid-proton-core) + # target_link_libraries (qpid-proton-proactor LINK_PUBLIC qpid-proton-core)
+ #target_link_libraries (qpid-proton-proactor LINK_PRIVATE ${PLATFORM_LIBS} ${PROACTOR_LIBS}) + # target_link_libraries (qpid-proton-proactor LINK_PRIVATE ${PLATFORM_LIBS} ${PROACTOR_LIBS})
+ #set_target_properties (qpid-proton-proactor + # set_target_properties (qpid-proton-proactor
+ # PROPERTIES + # PROPERTIES
+ # VERSION "${PN_LIB_PROACTOR_VERSION}" + # VERSION "${PN_LIB_PROACTOR_VERSION}"
+ # SOVERSION "${PN_LIB_PROACTOR_MAJOR_VERSION}" + # SOVERSION "${PN_LIB_PROACTOR_MAJOR_VERSION}"
+ # LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" + # LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
+ #) + # )
if (BUILD_STATIC_LIBS) if (BUILD_STATIC_LIBS)
add_library (qpid-proton-proactor-static STATIC ${qpid-proton-proactor}) add_library (qpid-proton-proactor-static STATIC ${qpid-proton-proactor})
endif(BUILD_STATIC_LIBS) endif(BUILD_STATIC_LIBS)
@@ -518,7 +518,7 @@ @@ -500,11 +500,11 @@
if (BUILD_STATIC_LIBS) if (BUILD_STATIC_LIBS)
set(STATIC_LIBS qpid-proton-static qpid-proton-core-static) set(STATIC_LIBS qpid-proton-static qpid-proton-core-static)
endif() endif()
-install(TARGETS qpid-proton qpid-proton-core ${STATIC_LIBS} -install(TARGETS qpid-proton qpid-proton-core ${STATIC_LIBS}
+install(TARGETS ${STATIC_LIBS} - EXPORT proton
EXPORT proton - RUNTIME DESTINATION bin
RUNTIME DESTINATION bin - ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR})
@@ -538,11 +538,11 @@ +# 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) if (BUILD_STATIC_LIBS)
set(STATIC_LIBS qpid-proton-proactor-static) set(STATIC_LIBS qpid-proton-proactor-static)
endif() endif()
@ -92,15 +98,15 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
- RUNTIME DESTINATION bin - RUNTIME DESTINATION bin
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}) - LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ #install(TARGETS qpid-proton-proactor ${STATIC_LIBS} + # install(TARGETS qpid-proton-proactor ${STATIC_LIBS}
+ # EXPORT proton + # EXPORT proton
+ # RUNTIME DESTINATION bin + # RUNTIME DESTINATION bin
+ # ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + # ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ # LIBRARY DESTINATION ${LIB_INSTALL_DIR}) + # LIBRARY DESTINATION ${LIB_INSTALL_DIR})
# Install windows pdb files # Install windows pdb files
if (MSVC) if (MSVC)
@@ -594,10 +594,10 @@ @@ -576,10 +576,10 @@
${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake
DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton) DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton)
@ -108,35 +114,32 @@ diff -ur qpid-proton-0.26.0/c/CMakeLists.txt qpid-proton-patched/c/CMakeLists.tx
-add_subdirectory(examples) -add_subdirectory(examples)
-add_subdirectory(tests) -add_subdirectory(tests)
-add_subdirectory(tools) -add_subdirectory(tools)
+#add_subdirectory(docs) +# add_subdirectory(docs)
+#add_subdirectory(examples) +# add_subdirectory(examples)
+#add_subdirectory(tests) +# add_subdirectory(tests)
+#add_subdirectory(tools) +# add_subdirectory(tools)
install (DIRECTORY examples/ install (DIRECTORY examples/
DESTINATION "${PROTON_SHARE}/examples/c" DESTINATION "${PROTON_SHARE}/examples/c"
diff -ur qpid-proton-0.26.0/CMakeLists.txt qpid-proton-patched/CMakeLists.txt diff -ur a/CMakeLists.txt b/CMakeLists.txt
--- qpid-proton-0.26.0/CMakeLists.txt 2018-10-04 04:09:02.000000000 -0600 --- a/CMakeLists.txt 2019-12-09 07:17:00.000000000 -0700
+++ qpid-proton-patched/CMakeLists.txt 2019-03-25 17:32:41.521213312 -0600 +++ b/CMakeLists.txt 2019-12-19 18:11:57.128248724 -0700
@@ -24,22 +24,22 @@ @@ -24,7 +24,7 @@
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tools/cmake/Modules") set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tools/cmake/Modules")
set (CMAKE_THREAD_PREFER_PTHREAD TRUE) set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
-include (CTest) -include (CTest)
+#include (CTest) +# include (CTest)
include (CheckLanguage) include (CheckLanguage)
include (CheckLibraryExists) include (CheckLibraryExists)
include (CheckSymbolExists) include (CheckSymbolExists)
include (CheckPythonModule) @@ -33,13 +33,13 @@
find_package (OpenSSL)
-find_package (OpenSSL)
+#find_package (OpenSSL)
find_package (Threads) find_package (Threads)
find_package (PythonInterp REQUIRED) find_package (PythonInterp REQUIRED)
-find_package (SWIG) -find_package (SWIG)
-find_package (CyrusSASL) +# find_package (SWIG)
+#find_package (SWIG) find_package (CyrusSASL)
+#find_package (CyrusSASL)
-enable_testing () -enable_testing ()
+#enable_testing () +#enable_testing ()
@ -147,39 +150,40 @@ diff -ur qpid-proton-0.26.0/CMakeLists.txt qpid-proton-patched/CMakeLists.txt
## Variables used across components ## 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.") 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.")
-set (BINDING_LANGS PYTHON RUBY) -set (BINDING_LANGS PYTHON RUBY)
+#set (BINDING_LANGS PYTHON RUBY) +# set (BINDING_LANGS PYTHON RUBY)
foreach (LANG ${BINDING_LANGS}) foreach (LANG ${BINDING_LANGS})
set (SYSINSTALL_${LANG} OFF CACHE BOOL "Install ${LANG} bindings into interpreter specified location.") set (SYSINSTALL_${LANG} OFF CACHE BOOL "Install ${LANG} bindings into interpreter specified location.")
@@ -327,7 +327,7 @@ @@ -315,7 +315,7 @@
endif() endif()
# Prerequisites for Go # Prerequisites for Go
-find_program(GO_EXE go) -find_program(GO_EXE go)
+#find_program(GO_EXE go) +# find_program(GO_EXE go)
mark_as_advanced(GO_EXE) mark_as_advanced(GO_EXE)
if (GO_EXE) if (GO_EXE)
set (DEFAULT_GO ON) set (DEFAULT_GO ON)
diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeLists.txt diff -ur a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
--- qpid-proton-0.26.0/cpp/CMakeLists.txt 2018-10-04 04:09:02.000000000 -0600 --- a/cpp/CMakeLists.txt 2019-12-09 07:17:00.000000000 -0700
+++ qpid-proton-patched/cpp/CMakeLists.txt 2019-03-25 17:32:41.521213312 -0600 +++ b/cpp/CMakeLists.txt 2019-12-19 18:13:35.410474818 -0700
@@ -174,25 +174,25 @@ @@ -174,30 +174,30 @@
set (CMAKE_DEBUG_POSTFIX "d") set (CMAKE_DEBUG_POSTFIX "d")
endif () endif ()
-add_library(qpid-proton-cpp SHARED ${qpid-proton-cpp-source}) -add_library(qpid-proton-cpp SHARED ${qpid-proton-cpp-source})
+#add_library(qpid-proton-cpp SHARED ${qpid-proton-cpp-source}) +# add_library(qpid-proton-cpp SHARED ${qpid-proton-cpp-source})
if(BUILD_STATIC_LIBS) if(BUILD_STATIC_LIBS)
add_library(qpid-proton-cpp-static STATIC ${qpid-proton-cpp-source}) add_library(qpid-proton-cpp-static STATIC ${qpid-proton-cpp-source})
set(STATIC_LIBS qpid-proton-cpp-static)
endif(BUILD_STATIC_LIBS) endif(BUILD_STATIC_LIBS)
-target_link_libraries (qpid-proton-cpp LINK_PRIVATE ${PLATFORM_LIBS} qpid-proton-core qpid-proton-proactor ${CONNECT_CONFIG_LIBS}) -target_link_libraries (qpid-proton-cpp LINK_PRIVATE ${PLATFORM_LIBS} qpid-proton-core qpid-proton-proactor ${CONNECT_CONFIG_LIBS})
+#target_link_libraries (qpid-proton-cpp LINK_PRIVATE ${PLATFORM_LIBS} qpid-proton-core qpid-proton-proactor ${CONNECT_CONFIG_LIBS}) +# target_link_libraries (qpid-proton-cpp LINK_PRIVATE ${PLATFORM_LIBS} qpid-proton-core qpid-proton-proactor ${CONNECT_CONFIG_LIBS})
-set_target_properties ( -set_target_properties (
- qpid-proton-cpp - qpid-proton-cpp
@ -189,23 +193,31 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
- SOVERSION "${PN_LIB_CPP_MAJOR_VERSION}" - SOVERSION "${PN_LIB_CPP_MAJOR_VERSION}"
- LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" - LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
- ) - )
+#set_target_properties ( +# set_target_properties (
+# qpid-proton-cpp +# qpid-proton-cpp
+# PROPERTIES +# PROPERTIES
+# LINKER_LANGUAGE CXX +# LINKER_LANGUAGE CXX
+# VERSION "${PN_LIB_CPP_VERSION}" +# VERSION "${PN_LIB_CPP_VERSION}"
+# SOVERSION "${PN_LIB_CPP_MAJOR_VERSION}" +# SOVERSION "${PN_LIB_CPP_MAJOR_VERSION}"
+# LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" +# LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
+# ) +# )
## Install ## Install
-install(TARGETS qpid-proton-cpp -install(TARGETS qpid-proton-cpp ${STATIC_LIBS}
+install(TARGETS qpid-proton-cpp-static - EXPORT proton-cpp
EXPORT proton-cpp - RUNTIME DESTINATION bin
RUNTIME DESTINATION bin - ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - LIBRARY 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 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 (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") install (FILES "${CMAKE_CURRENT_BINARY_DIR}/config_presets.hpp" DESTINATION "${INCLUDE_INSTALL_DIR}/proton/internal")
@ -213,17 +225,17 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
- DESTINATION "${PROTON_SHARE}/examples/cpp" - DESTINATION "${PROTON_SHARE}/examples/cpp"
- USE_SOURCE_PERMISSIONS - USE_SOURCE_PERMISSIONS
- PATTERN "ProtonCppConfig.cmake" EXCLUDE) - PATTERN "ProtonCppConfig.cmake" EXCLUDE)
+#install (DIRECTORY "examples/" +# install (DIRECTORY "examples/"
+# DESTINATION "${PROTON_SHARE}/examples/cpp" +# DESTINATION "${PROTON_SHARE}/examples/cpp"
+# USE_SOURCE_PERMISSIONS +# USE_SOURCE_PERMISSIONS
+# PATTERN "ProtonCppConfig.cmake" EXCLUDE) +# PATTERN "ProtonCppConfig.cmake" EXCLUDE)
-add_subdirectory(examples) -add_subdirectory(examples)
+#add_subdirectory(examples) +# add_subdirectory(examples)
add_subdirectory(docs) add_subdirectory(docs)
# Pkg config file # Pkg config file
@@ -267,28 +267,28 @@ @@ -268,31 +268,31 @@
set(test_env ${test_env} "PATH=$<TARGET_FILE_DIR:qpid-proton>") set(test_env ${test_env} "PATH=$<TARGET_FILE_DIR:qpid-proton>")
endif() 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(scalar_test)
-add_cpp_test(value_test) -add_cpp_test(value_test)
-add_cpp_test(container_test) -add_cpp_test(container_test)
-add_cpp_test(url_test)
-add_cpp_test(reconnect_test) -add_cpp_test(reconnect_test)
-add_cpp_test(link_test) -add_cpp_test(link_test)
-add_cpp_test(credit_test)
-if (ENABLE_JSONCPP) -if (ENABLE_JSONCPP)
- add_cpp_test(connect_config_test) - add_cpp_test(connect_config_test)
- target_link_libraries(connect_config_test qpid-proton-core) # For pn_sasl_enabled - target_link_libraries(connect_config_test qpid-proton-core) # For pn_sasl_enabled
@ -252,48 +264,31 @@ diff -ur qpid-proton-0.26.0/cpp/CMakeLists.txt qpid-proton-patched/cpp/CMakeList
- # Test data and output directories for connect_config_test - # Test data and output directories for connect_config_test
- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/testdata" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") - file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/testdata" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-endif() -endif()
+#macro(add_cpp_test test) +# macro(add_cpp_test test)
+# add_executable (${test} src/${test}.cpp) +# add_executable (${test} src/${test}.cpp)
+# target_link_libraries (${test} qpid-proton-cpp ${PLATFORM_LIBS}) +# target_link_libraries (${test} qpid-proton-cpp ${PLATFORM_LIBS})
+# add_test (NAME cpp-${test} +# add_test (NAME cpp-${test}
+# COMMAND ${PN_ENV_SCRIPT} -- ${test_env} ${TEST_EXE_PREFIX_CMD} $<TARGET_FILE:${test}> ${ARGN}) +# COMMAND ${PN_ENV_SCRIPT} -- ${test_env} ${TEST_EXE_PREFIX_CMD} $<TARGET_FILE:${test}> ${ARGN})
+#endmacro(add_cpp_test) +# endmacro(add_cpp_test)
+# +#
+#add_cpp_test(codec_test) +# add_cpp_test(codec_test)
+#add_cpp_test(connection_driver_test) +# add_cpp_test(connection_driver_test)
+#add_cpp_test(interop_test ${CMAKE_SOURCE_DIR}/tests) +# add_cpp_test(interop_test ${CMAKE_SOURCE_DIR}/tests)
+#add_cpp_test(message_test) +# add_cpp_test(message_test)
+#add_cpp_test(map_test) +# add_cpp_test(map_test)
+#add_cpp_test(scalar_test) +# add_cpp_test(scalar_test)
+#add_cpp_test(value_test) +# add_cpp_test(value_test)
+#add_cpp_test(container_test) +# add_cpp_test(container_test)
+#add_cpp_test(url_test) +# add_cpp_test(reconnect_test)
+#add_cpp_test(reconnect_test) +# add_cpp_test(link_test)
+#add_cpp_test(link_test) +# add_cpp_test(credit_test)
+#if (ENABLE_JSONCPP) +# if (ENABLE_JSONCPP)
+# add_cpp_test(connect_config_test) +# add_cpp_test(connect_config_test)
+# target_link_libraries(connect_config_test qpid-proton-core) # For pn_sasl_enabled +# target_link_libraries(connect_config_test qpid-proton-core) # For pn_sasl_enabled
+# set_tests_properties(cpp-connect_config_test PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") +# set_tests_properties(cpp-connect_config_test PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+# # Test data and output directories for connect_config_test +# # Test data and output directories for connect_config_test
+# file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/testdata" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") +# file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/testdata" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+#endif() +# 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 # TODO aconway 2018-10-31: Catch2 tests
-PN_CPP_DEPRECATED("Use a third-party URL library") # This is a simple example of a C++ test using the Catch2 framework.
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