You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/11/20 02:04:04 UTC
svn commit: r882373 - in /qpid/trunk/qpid/cpp: ./ docs/api/ etc/ examples/
examples/direct/ examples/failover/ examples/fanout/ examples/messaging/
examples/pub-sub/ examples/qmf-console/ examples/request-response/
examples/tradedemo/ examples/xml-exch...
Author: shuston
Date: Fri Nov 20 01:04:03 2009
New Revision: 882373
URL: http://svn.apache.org/viewvc?rev=882373&view=rev
Log:
Removed the Visual Studio solution/project files, as these are now generated by CMake. Added CMakeLists.txt files to Makefile.am, and all other needed support files so that the 'make dist' supplies all needed items for building a release kit on Windows. Fixes QPID-2134
Removed:
qpid/trunk/qpid/cpp/src/broker.vcproj
qpid/trunk/qpid/cpp/src/client.vcproj
qpid/trunk/qpid/cpp/src/common.vcproj
qpid/trunk/qpid/cpp/src/protocol_gen.mak
qpid/trunk/qpid/cpp/src/qmfagent.vcproj
qpid/trunk/qpid/cpp/src/qmfconsole.vcproj
qpid/trunk/qpid/cpp/src/qpid.sln
qpid/trunk/qpid/cpp/src/qpidbroker.vcproj
qpid/trunk/qpid/cpp/src/tests/client_test.vcproj
qpid/trunk/qpid/cpp/src/tests/consume.vcproj
qpid/trunk/qpid/cpp/src/tests/echotest.vcproj
qpid/trunk/qpid/cpp/src/tests/header_test.vcproj
qpid/trunk/qpid/cpp/src/tests/latencytest.vcproj
qpid/trunk/qpid/cpp/src/tests/perftest.vcproj
qpid/trunk/qpid/cpp/src/tests/publish.vcproj
qpid/trunk/qpid/cpp/src/tests/receiver.vcproj
qpid/trunk/qpid/cpp/src/tests/sender.vcproj
qpid/trunk/qpid/cpp/src/tests/shlibtest.vcproj
qpid/trunk/qpid/cpp/src/tests/tests.sln
qpid/trunk/qpid/cpp/src/tests/topic_listener.vcproj
qpid/trunk/qpid/cpp/src/tests/topic_publisher.vcproj
qpid/trunk/qpid/cpp/src/tests/txjob.vcproj
qpid/trunk/qpid/cpp/src/tests/txshift.vcproj
qpid/trunk/qpid/cpp/src/tests/txtest.vcproj
qpid/trunk/qpid/cpp/src/tests/unit_test.vcproj
Modified:
qpid/trunk/qpid/cpp/Makefile.am
qpid/trunk/qpid/cpp/docs/api/Makefile.am
qpid/trunk/qpid/cpp/etc/Makefile.am
qpid/trunk/qpid/cpp/examples/Makefile.am
qpid/trunk/qpid/cpp/examples/direct/Makefile.am
qpid/trunk/qpid/cpp/examples/failover/Makefile.am
qpid/trunk/qpid/cpp/examples/fanout/Makefile.am
qpid/trunk/qpid/cpp/examples/messaging/Makefile.am
qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am
qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
qpid/trunk/qpid/cpp/examples/request-response/Makefile.am
qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am
qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am
qpid/trunk/qpid/cpp/managementgen/Makefile.am
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/tests/Makefile.am
Modified: qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/Makefile.am Fri Nov 20 01:04:03 2009
@@ -24,7 +24,7 @@
EXTRA_DIST = \
LICENSE NOTICE README SSL RELEASE_NOTES DESIGN \
- xml/cluster.xml INSTALL-WINDOWS
+ xml/cluster.xml INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake
SUBDIRS = managementgen etc src docs/api docs/man examples bindings/qmf
Modified: qpid/trunk/qpid/cpp/docs/api/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/docs/api/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/docs/api/Makefile.am Fri Nov 20 01:04:03 2009
@@ -23,7 +23,7 @@
if HAVE_DOXYGEN
-EXTRA_DIST = html user.doxygen developer.doxygen html.timestamp
+EXTRA_DIST = html user.doxygen developer.doxygen html.timestamp CMakeLists.txt
html: html.timestamp
Modified: qpid/trunk/qpid/cpp/etc/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/etc/Makefile.am Fri Nov 20 01:04:03 2009
@@ -20,7 +20,7 @@
EXTRA_DIST = \
$(SASL_CONF) \
- qpidd qpidd.conf qpidc.conf
+ qpidd qpidd.conf qpidc.conf CMakeLists.txt
confdir=$(sysconfdir)/qpid
nobase_conf_DATA=\
Modified: qpid/trunk/qpid/cpp/examples/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/Makefile.am Fri Nov 20 01:04:03 2009
@@ -37,7 +37,7 @@
examplesdir=$(pkgdatadir)/examples
dist_examples_DATA = README.txt $(MAKEDIST)
-EXTRA_DIST = README.verify verify verify_all examples.sln
+EXTRA_DIST = README.verify verify verify_all examples.sln CMakeLists.txt
# For older versions of automake
abs_top_srcdir = @abs_top_srcdir@
Modified: qpid/trunk/qpid/cpp/examples/direct/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/direct/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/direct/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/direct/Makefile.am Fri Nov 20 01:04:03 2009
@@ -39,6 +39,7 @@
EXTRA_DIST= \
$(examples_DATA) \
+ CMakeLists.txt \
verify \
verify.in \
verify_cpp_python \
Modified: qpid/trunk/qpid/cpp/examples/failover/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/failover/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/failover/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/failover/Makefile.am Fri Nov 20 01:04:03 2009
@@ -41,6 +41,7 @@
# FIXME aconway 2008-10-10: add verify scripts.
EXTRA_DIST= \
+ CMakeLists.txt \
failover_declare_queues.vcproj \
failover_replaying_sender.vcproj \
failover_resuming_receiver.vcproj
Modified: qpid/trunk/qpid/cpp/examples/fanout/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/fanout/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/fanout/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/fanout/Makefile.am Fri Nov 20 01:04:03 2009
@@ -35,6 +35,7 @@
EXTRA_DIST= \
$(examples_DATA) \
+ CMakeLists.txt \
verify \
verify.in \
verify_cpp_python \
Modified: qpid/trunk/qpid/cpp/examples/messaging/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/Makefile.am Fri Nov 20 01:04:03 2009
@@ -54,6 +54,7 @@
map_receiver_LDADD=$(CLIENT_LIB)
EXTRA_DIST= \
+ CMakeLists.txt \
messaging_client.vcproj \
messaging_map_receiver.vcproj \
messaging_map_sender.vcproj \
Modified: qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am Fri Nov 20 01:04:03 2009
@@ -36,6 +36,7 @@
EXTRA_DIST= \
$(examples_DATA) \
+ CMakeLists.txt \
verify \
verify.in \
verify_cpp_python \
Modified: qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am Fri Nov 20 01:04:03 2009
@@ -48,6 +48,7 @@
$(MAKEDIST)
EXTRA_DIST= \
+ CMakeLists.txt \
qmf-console_console.vcproj \
qmf-console_ping.vcproj \
qmf-console_printevents.vcproj \
Modified: qpid/trunk/qpid/cpp/examples/request-response/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/request-response/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/request-response/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/request-response/Makefile.am Fri Nov 20 01:04:03 2009
@@ -36,6 +36,7 @@
EXTRA_DIST= \
$(examples_DATA) \
+ CMakeLists.txt \
verify \
verify.in \
verify_cpp_python \
Modified: qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am Fri Nov 20 01:04:03 2009
@@ -40,6 +40,7 @@
$(MAKEDIST)
EXTRA_DIST= \
+ CMakeLists.txt \
tradedemo_declare_queues.vcproj \
tradedemo_topic_listener.vcproj \
tradedemo_topic_publisher.vcproj
Modified: qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am Fri Nov 20 01:04:03 2009
@@ -33,7 +33,8 @@
listener_LDADD=$(CLIENT_LIB)
EXTRA_DIST= \
- README
+ README \
+ CMakeLists.txt
examples_DATA= \
$(EXTRA_DIST) \
Modified: qpid/trunk/qpid/cpp/managementgen/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/managementgen/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/managementgen/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/managementgen/Makefile.am Fri Nov 20 01:04:03 2009
@@ -33,4 +33,4 @@
qmfgen/templates/Package.h \
qmfgen/management-types.xml
-EXTRA_DIST = $(nobase_qmfpython_DATA)
+EXTRA_DIST = $(nobase_qmfpython_DATA) CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Nov 20 01:04:03 2009
@@ -92,14 +92,16 @@
message(STATUS "No need to generate Qpid Management Framework sources")
endif (regen_mgmt)
+ # Pull in the names of the generated files, i.e. ${rgen_framing_srcs}
+ include (${CMAKE_CURRENT_BINARY_DIR}/rubygen.cmake)
+ include (${CMAKE_CURRENT_BINARY_DIR}/managementgen.cmake)
+
else (EXISTS ${AMQP_SPEC})
- message(STATUS "No AMQP spec... won't generate sources")
+ message(STATUS "No AMQP spec... presume generated sources are included")
+ include (rubygen.cmake)
+ include (managementgen.cmake)
endif (EXISTS ${AMQP_SPEC})
-# Pull in the names of the generated files, i.e. ${rgen_framing_srcs}
-include (${CMAKE_CURRENT_BINARY_DIR}/rubygen.cmake)
-include (${CMAKE_CURRENT_BINARY_DIR}/managementgen.cmake)
-
find_program(HELP2MAN help2man DOC "Location of the help2man program")
option(GEN_MANPAGES "Use help2man to generate man pages" ON)
if (GEN_MANPAGES AND NOT HELP2MAN)
@@ -513,7 +515,6 @@
qpid/framing/AMQHeaderBody.cpp
qpid/framing/AMQHeartbeatBody.cpp
qpid/framing/Array.cpp
- qpid/framing/BodyHolder.cpp
qpid/framing/BodyHandler.cpp
qpid/framing/Buffer.cpp
qpid/framing/Endian.cpp
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Fri Nov 20 01:04:03 2009
@@ -23,13 +23,6 @@
# are listed here to ensure they're included in releases. They are built
# using Visual Studio solutions/projects.
windows_dist = \
- qpid.sln \
- broker.vcproj \
- common.vcproj \
- client.vcproj \
- qpidbroker.vcproj \
- qmfconsole.vcproj \
- protocol_gen.mak \
qpid/client/windows/SaslFactory.cpp \
qpid/log/windows/SinkOptions.cpp \
qpid/log/windows/SinkOptions.h \
@@ -47,6 +40,7 @@
qpid/sys/windows/PipeHandle.cpp \
../include/qpid/sys/windows/Mutex.h \
qpid/sys/windows/Shlib.cpp \
+ qpid/sys/windows/SocketAddress.cpp \
qpid/sys/windows/Socket.cpp \
qpid/sys/windows/StrError.cpp \
qpid/sys/windows/SystemInfo.cpp \
@@ -82,16 +76,21 @@
# Ruby generator.
rgen_dir=$(top_srcdir)/rubygen
-rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate . ../include $(specs) all $(srcdir)/rubygen.mk
+rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate . ../include $(specs) all
$(rgen_srcs) $(srcdir)/rubygen.mk: rgen.timestamp
rgen.timestamp: $(rgen_generator) $(specs)
- $(rgen_cmd); touch $@
+ $(rgen_cmd) $(srcdir)/rubygen.mk; touch $@
$(rgen_generator):
+# The CMake version is needed for dist
+$(srcdir)/rubygen.cmake: $(rgen_generator) $(specs)
+ $(rgen_cmd) $(srcdir)/rubygen.cmake
+
# Management generator.
mgen_dir=$(top_srcdir)/managementgen
-mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk -q -b -o qmf \
+mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
+ -c $(srcdir)/managementgen.cmake -q -b -o qmf \
$(top_srcdir)/../specs/management-schema.xml \
$(srcdir)/qpid/acl/management-schema.xml \
$(srcdir)/qpid/cluster/management-schema.xml
@@ -269,6 +268,13 @@
# New 0-10 codec, to be integrated in future.
# libqpidamqp_0_10_la_SOURCES=
EXTRA_DIST +=\
+ CMakeLists.txt \
+ cluster.cmake \
+ config.h.cmake \
+ rdma.cmake \
+ ssl.cmake \
+ managementgen.cmake \
+ rubygen.cmake \
$(rgen_amqp_0_10_srcs) \
qpid/amqp_0_10/apply.h \
qpid/amqp_0_10/built_in_types.h \
@@ -299,7 +305,8 @@
qpid/amqp_0_10/UnknownType.h \
qpid/amqp_0_10/UnknownType.cpp \
qpid/amqp_0_10/UnknownStruct.h \
- qpid/amqp_0_10/UnknownStruct.cpp
+ qpid/amqp_0_10/UnknownStruct.cpp \
+ qpid/store
libqpidcommon_la_LIBADD = \
-lboost_program_options \
Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=882373&r1=882372&r2=882373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Fri Nov 20 01:04:03 2009
@@ -329,6 +329,7 @@
federated_cluster_test_with_node_failure
EXTRA_DIST+= \
+ CMakeLists.txt \
python_env.sh \
fanout_perftest \
shared_perftest \
@@ -336,24 +337,8 @@
topic_perftest \
run_failover_soak \
reliable_replication_test \
- federated_cluster_test_with_node_failure \
- tests.sln \
- client_test.vcproj \
- consume.vcproj \
- echotest.vcproj \
- header_test.vcproj \
- latencytest.vcproj \
- perftest.vcproj \
- publish.vcproj \
- receiver.vcproj \
- sender.vcproj \
- shlibtest.vcproj \
- topic_listener.vcproj \
- topic_publisher.vcproj \
- txjob.vcproj \
- txshift.vcproj \
- txtest.vcproj \
- unit_test.vcproj
+ federated_cluster_test_with_node_failure \
+ windows/DisableWin32ErrorWindows.cpp
check-long:
$(MAKE) check TESTS="$(LONG_TESTS)" VALGRIND=
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org