You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2013/10/04 19:41:50 UTC
svn commit: r1529235 - in /qpid/trunk/qpid/cpp: bld-winsdk.ps1
src/CMakeLists.txt src/amqp.cmake src/tests/brokertest.py
src/tests/interlink_tests.py src/tests/swig_python_tests
src/tests/test_env.sh.in
Author: chug
Date: Fri Oct 4 17:41:50 2013
New Revision: 1529235
URL: http://svn.apache.org/r1529235
Log:
QPID-5115: AMQP 1.0 client support built in to qpidmessaging for all platforms
This commit disposes of the amqpc library and moves the functions into the
qpidmessaging library. Now any client that loads qpidmessaging gets amqp0-10
and amqp1.0 selectable through the connection protocol option. C++ brokers
still must load the amqp library to enable 1.0 support.
Modified:
qpid/trunk/qpid/cpp/bld-winsdk.ps1
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/amqp.cmake
qpid/trunk/qpid/cpp/src/tests/brokertest.py
qpid/trunk/qpid/cpp/src/tests/interlink_tests.py
qpid/trunk/qpid/cpp/src/tests/swig_python_tests
qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
Modified: qpid/trunk/qpid/cpp/bld-winsdk.ps1
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bld-winsdk.ps1?rev=1529235&r1=1529234&r2=1529235&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bld-winsdk.ps1 (original)
+++ qpid/trunk/qpid/cpp/bld-winsdk.ps1 Fri Oct 4 17:41:50 2013
@@ -220,9 +220,7 @@ function BuildAPlatform
('bin/*.dll', 'bin/Release'),
('bin/*test.exe', 'bin/Release'),
('bin/qpid-send.exe', 'bin/Release'),
- ('bin/qpid-receive.exe', 'bin/Release'),
- ('plugins/client/*d.dll','bin/Debug'),
- ('plugins/client/*.dll', 'bin/Release')
+ ('bin/qpid-receive.exe', 'bin/Release')
)
$preserve=(
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1529235&r1=1529234&r2=1529235&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Oct 4 17:41:50 2013
@@ -1196,6 +1196,7 @@ install (DIRECTORY ../include/qpid
install_pdb (qpidclient ${QPID_COMPONENT_CLIENT})
set (qpidmessaging_SOURCES
+ ${amqpc_SOURCES}
qpid/messaging/AddressImpl.h
qpid/messaging/ConnectionImpl.h
qpid/messaging/ReceiverImpl.h
@@ -1243,7 +1244,7 @@ set (qpidmessaging_SOURCES
add_msvc_version (qpidmessaging library dll)
add_library (qpidmessaging SHARED ${qpidmessaging_SOURCES})
-target_link_libraries (qpidmessaging qpidtypes qpidclient qpidcommon)
+target_link_libraries (qpidmessaging qpidtypes qpidclient qpidcommon ${PROTON_LIBRARIES})
set_target_properties (qpidmessaging PROPERTIES
LINK_FLAGS "${HIDE_SYMBOL_FLAGS} ${LINK_VERSION_SCRIPT_FLAG}"
COMPILE_FLAGS "${HIDE_SYMBOL_FLAGS}"
Modified: qpid/trunk/qpid/cpp/src/amqp.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/amqp.cmake?rev=1529235&r1=1529234&r2=1529235&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/amqp.cmake (original)
+++ qpid/trunk/qpid/cpp/src/amqp.cmake Fri Oct 4 17:41:50 2013
@@ -163,15 +163,6 @@ if (BUILD_AMQP)
qpid/messaging/amqp/TcpTransport.h
qpid/messaging/amqp/TcpTransport.cpp
)
- add_library (amqpc MODULE ${amqpc_SOURCES})
- target_link_libraries (amqpc qpidmessaging qpidtypes qpidclient qpidcommon ${PROTON_LIBRARIES})
- set_target_properties (amqpc PROPERTIES
- PREFIX ""
- LINK_FLAGS "${CATCH_UNDEFINED}")
-
- install (TARGETS amqpc
- DESTINATION ${QPIDC_MODULE_DIR}
- COMPONENT ${QPID_COMPONENT_CLIENT})
if (WIN32)
set(proton_dll "${PROTON_LIBRARY_DIRS}/${PROTON_LIBRARIES}.dll")
@@ -186,4 +177,8 @@ if (BUILD_AMQP)
COMPONENT ${QPID_COMPONENT_COMMON}
CONFIGURATIONS Debug)
endif (WIN32)
+else (BUILD_AMQP)
+ # ensure that qpid build ignores proton
+ UNSET( amqpc_SOURCES )
+ UNSET( PROTON_LIBRARIES )
endif (BUILD_AMQP)
Modified: qpid/trunk/qpid/cpp/src/tests/brokertest.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/brokertest.py?rev=1529235&r1=1529234&r2=1529235&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/brokertest.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/brokertest.py Fri Oct 4 17:41:50 2013
@@ -424,7 +424,6 @@ class BrokerTest(TestCase):
ha_lib = os.getenv("HA_LIB")
xml_lib = os.getenv("XML_LIB")
amqp_lib = os.getenv("AMQP_LIB")
- amqpc_lib = os.getenv("AMQPC_LIB")
qpid_config_exec = os.getenv("QPID_CONFIG_EXEC")
qpid_route_exec = os.getenv("QPID_ROUTE_EXEC")
receiver_exec = os.getenv("RECEIVER_EXEC")
Modified: qpid/trunk/qpid/cpp/src/tests/interlink_tests.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/interlink_tests.py?rev=1529235&r1=1529234&r2=1529235&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/interlink_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/interlink_tests.py Fri Oct 4 17:41:50 2013
@@ -46,7 +46,6 @@ class AmqpBrokerTest(BrokerTest):
"""
def setUp(self):
BrokerTest.setUp(self)
- os.putenv("QPID_LOAD_MODULE", BrokerTest.amqpc_lib)
self.port_holder = HaPort(self)
self.broker = self.amqp_broker(port_holder=self.port_holder)
self.default_config = Config(self.broker)
Modified: qpid/trunk/qpid/cpp/src/tests/swig_python_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/swig_python_tests?rev=1529235&r1=1529234&r2=1529235&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/swig_python_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/swig_python_tests Fri Oct 4 17:41:50 2013
@@ -52,8 +52,7 @@ echo "Running swigged python tests using
export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_SWIG
export QPID_USE_SWIG_CLIENT=1
$QPID_PYTHON_TEST -m qpid.tests.messaging.message -m qpid_tests.broker_0_10.priority -m qpid_tests.broker_0_10.lvq -m qpid_tests.broker_0_10.new_api -b localhost:$QPID_PORT -I $srcdir/failing-amqp0-10-python-tests || FAILED=1
-if [[ -a $AMQPC_LIB ]] ; then
- export QPID_LOAD_MODULE=$AMQPC_LIB
+if [[ -a $AMQP_LIB ]] ; then
$QPID_PYTHON_TEST --define="protocol_version=amqp1.0" -m qpid_tests.broker_1_0 -m qpid_tests.broker_0_10.new_api -m assertions -b localhost:$QPID_PORT -I $srcdir/failing-amqp1.0-python-tests || FAILED=1
fi
stop_broker
Modified: qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_env.sh.in?rev=1529235&r1=1529234&r2=1529235&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_env.sh.in (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_env.sh.in Fri Oct 4 17:41:50 2013
@@ -67,7 +67,6 @@ exportmodule HA_LIB ha.so
exportmodule XML_LIB xml.so
exportmodule STORE_LIB legacystore.so
exportmodule AMQP_LIB amqp.so
-exportmodule AMQPC_LIB amqpc.so
# Qpid options
export QPID_NO_MODULE_DIR=1 # Don't accidentally load installed modules
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org