Author: aconway
Date: Fri Jun 20 14:23:23 2008
New Revision: 670066
URL: http://svn.apache.org/viewvc?rev=670066&view=rev
Log:
Patch from Manuel Teira:
https://issues.apache.org/jira/secure/CommentAssignIssue!default.jspa?action=5&id=12398038
- Use standard automake makefiles to build cpp/examples.
- Rationalize examples directory structure.
Additions to patch:
- Fix for VPATH builds.
- Fix make distcheck (finally!)
Added:
incubator/qpid/trunk/qpid/cpp/examples/Makefile
- copied unchanged from r669281,
incubator/qpid/trunk/qpid/cpp/examples/examples/Makefile
incubator/qpid/trunk/qpid/cpp/examples/README.verify (with props)
incubator/qpid/trunk/qpid/cpp/examples/direct/ (props changed)
- copied from r669281,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/
incubator/qpid/trunk/qpid/cpp/examples/direct/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/direct/declare_queues.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/declare_queues.cpp
incubator/qpid/trunk/qpid/cpp/examples/direct/direct_producer.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/direct_producer.cpp
incubator/qpid/trunk/qpid/cpp/examples/direct/listener.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/direct/verify
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify
incubator/qpid/trunk/qpid/cpp/examples/direct/verify.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify.in
incubator/qpid/trunk/qpid/cpp/examples/direct/verify_cpp_python
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python
incubator/qpid/trunk/qpid/cpp/examples/direct/verify_cpp_python.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python.in
incubator/qpid/trunk/qpid/cpp/examples/direct/verify_python_cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp
incubator/qpid/trunk/qpid/cpp/examples/direct/verify_python_cpp.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp.in
incubator/qpid/trunk/qpid/cpp/examples/fanout/ (props changed)
- copied from r669281,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/
incubator/qpid/trunk/qpid/cpp/examples/fanout/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_producer.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/fanout_producer.cpp
incubator/qpid/trunk/qpid/cpp/examples/fanout/listener.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/fanout/verify
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify
incubator/qpid/trunk/qpid/cpp/examples/fanout/verify.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify.in
incubator/qpid/trunk/qpid/cpp/examples/fanout/verify_cpp_python
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python
incubator/qpid/trunk/qpid/cpp/examples/fanout/verify_cpp_python.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python.in
incubator/qpid/trunk/qpid/cpp/examples/fanout/verify_python_cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_python_cpp
incubator/qpid/trunk/qpid/cpp/examples/fanout/verify_python_cpp.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_python_cpp.in
incubator/qpid/trunk/qpid/cpp/examples/makedist.mk
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/ (props changed)
- copied from r669281,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_listener.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_publisher.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/topic_publisher.cpp
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/verify
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/verify.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify.in
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/verify_cpp_python
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/verify_cpp_python.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python.in
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/verify_python_cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/verify_python_cpp.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp.in
incubator/qpid/trunk/qpid/cpp/examples/request-response/ (props changed)
- copied from r669281,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/
incubator/qpid/trunk/qpid/cpp/examples/request-response/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/request-response/client.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/client.cpp
incubator/qpid/trunk/qpid/cpp/examples/request-response/server.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/server.cpp
incubator/qpid/trunk/qpid/cpp/examples/request-response/verify
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify
incubator/qpid/trunk/qpid/cpp/examples/request-response/verify.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify.in
incubator/qpid/trunk/qpid/cpp/examples/request-response/verify_cpp_python
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python
incubator/qpid/trunk/qpid/cpp/examples/request-response/verify_cpp_python.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python.in
incubator/qpid/trunk/qpid/cpp/examples/request-response/verify_python_cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_python_cpp
incubator/qpid/trunk/qpid/cpp/examples/request-response/verify_python_cpp.in
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_python_cpp.in
incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/ (props changed)
- copied from r669281,
incubator/qpid/trunk/qpid/cpp/examples/examples/xml-exchange/
incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/README
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/xml-exchange/README
incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/declare_queues.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/xml-exchange/declare_queues.cpp
incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/xml-exchange/listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/xml_producer.cpp
- copied unchanged from r670057,
incubator/qpid/trunk/qpid/cpp/examples/examples/xml-exchange/xml_producer.cpp
Removed:
incubator/qpid/trunk/qpid/cpp/examples/direct/Makefile
incubator/qpid/trunk/qpid/cpp/examples/examples/
incubator/qpid/trunk/qpid/cpp/examples/fanout/Makefile
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile
incubator/qpid/trunk/qpid/cpp/examples/request-response/Makefile
incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrindrc
Modified:
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/etc/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/verify
incubator/qpid/trunk/qpid/cpp/examples/verify_all
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk
incubator/qpid/trunk/qpid/cpp/src/tests/run_test
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Fri Jun 20 14:23:23 2008
@@ -273,6 +273,11 @@
qpidc.spec
Makefile
examples/Makefile
+ examples/direct/Makefile
+ examples/fanout/Makefile
+ examples/pub-sub/Makefile
+ examples/request-response/Makefile
+ examples/xml-exchange/Makefile
managementgen/Makefile
etc/Makefile
src/Makefile
Modified: incubator/qpid/trunk/qpid/cpp/etc/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/Makefile.am?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/etc/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/Makefile.am Fri Jun 20 14:23:23 2008
@@ -31,4 +31,7 @@
# users live, and we want the users to exist in that realm as well.
$(SASL_DB):
echo guest | /usr/sbin/saslpasswd2 -c -p -f $(SASL_DB) -u QPID guest
+
+CLEANFILES=$(SASL_DB)
+
endif
Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Fri Jun 20 14:23:23 2008
@@ -1,73 +1,23 @@
+SUBDIRS = direct fanout pub-sub request-response
+if HAVE_XML
+ SUBDIRS += xml-exchange
+endif
-# List all example files here
-nobase_pkgdata_DATA= \
- examples/README \
- examples/Makefile \
- examples/request-response/client.cpp \
- examples/request-response/server.cpp \
- examples/request-response/Makefile \
- examples/fanout/Makefile \
- examples/fanout/listener.cpp \
- examples/fanout/fanout_producer.cpp \
- examples/pub-sub/Makefile \
- examples/pub-sub/topic_publisher.cpp \
- examples/pub-sub/topic_listener.cpp \
- examples/direct/Makefile \
- examples/direct/direct_producer.cpp \
- examples/direct/listener.cpp \
- examples/direct/declare_queues.cpp \
- examples/xml-exchange/Makefile \
- examples/xml-exchange/declare_queues.cpp \
- examples/xml-exchange/xml_producer.cpp \
- examples/xml-exchange/listener.cpp
-
-VERIFY_FILES= verify verify_all \
- examples/request-response/verify \
- examples/request-response/verify.in \
- examples/request-response/verify_cpp_python \
- examples/request-response/verify_cpp_python.in \
- examples/request-response/verify_python_cpp \
- examples/request-response/verify_python_cpp.in \
- examples/fanout/verify \
- examples/fanout/verify.in \
- examples/fanout/verify_cpp_python \
- examples/fanout/verify_cpp_python.in \
- examples/fanout/verify_python_cpp \
- examples/fanout/verify_python_cpp.in \
- examples/pub-sub/verify \
- examples/pub-sub/verify.in \
- examples/pub-sub/verify_cpp_python \
- examples/pub-sub/verify_cpp_python.in \
- examples/pub-sub/verify_python_cpp \
- examples/pub-sub/verify_python_cpp.in \
- examples/direct/verify \
- examples/direct/verify.in \
- examples/direct/verify_cpp_python \
- examples/direct/verify_cpp_python.in \
- examples/direct/verify_python_cpp \
- examples/direct/verify_python_cpp.in
-
-EXTRA_DIST=$(nobase_pkgdata_DATA) $(VERIFY_FILES)
-
-# Note: we don't use normal automake SUBDIRS because the example
-# makefiles don't understand all the recursive automake targets.
-
-clean-local:
- cd examples; $(MAKE) clean
- rm -f examples/*/*.out examples/*/*.wait
-
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+MAKEDIST=.libs/Makefile
+SUBMAKE=' for d in $(SUBDIRS) ; do $$(MAKE) -C $$$$d $$@ ; done'
+$(MAKEDIST): Makefile
+ @$(MKDIR_P) .libs
+ @$(ECHO) all: > $(MAKEDIST)
+ @$(ECHO) $(SUBMAKE) >> $(MAKEDIST)
+ @$(ECHO) clean: >> $(MAKEDIST)
+ @$(ECHO) $(SUBMAKE) >> $(MAKEDIST)
-# Build the examples - copy sources to the build tree in VPATH build.
-all-local:
- test -d examples || cp -R $(srcdir)/examples .
- cd examples && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)
-I$(abs_top_srcdir)/src -I$(abs_top_srcdir)/src/gen -I$(abs_top_builddir)/src
-I$(abs_top_builddir)/src/gen -L$(abs_top_builddir)/src/.libs
-Wl,-rpath,$(abs_top_builddir)/src/.libs" all
+examplesdir=$(pkgdatadir)/examples
+examples_DATA = README $(MAKEDIST)
-if !HAVE_XML
-exclude_examples_regexp="xml" # Exclude XML examples.
-endif
+EXTRA_DIST = $(examples_DATA) README.verify verify verify_all
# Verify the examples in the buid tree.
-check-local: all-local verify
- $(srcdir)/verify_all $(abs_top_srcdir)/.. $(top_builddir)/src/qpidd
$(exclude_examples_regexp)
+check-local:
+ $(srcdir)/verify_all $(abs_top_srcdir)/.. $(abs_top_builddir)/src/qpidd
$(exclude_examples_regexp)
+
Added: incubator/qpid/trunk/qpid/cpp/examples/README.verify
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/README.verify?rev=670066&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/README.verify (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/README.verify Fri Jun 20 14:23:23
2008
@@ -0,0 +1,26 @@
+= Qpid C++ Examples =
+
+For more information read examples/README.
+
+== The Verify All Script ==
+
+The verify_all script will run C++ examples against itself and against the
+Python examples. The success of the script is determined by comparing its
output
+against what is expected.
+
+=== Arguments ===
+
+The verify_all script expects the path to Qpid trunk as an argument, in order
to
+setup the environment for Python examples.
+
+== The Verify Script ==
+
+The verify script is capable of running one or many scripts designed to verify
+the success of Qpid examples. The verify script is utilized by the verify_all
+scripts.
+
+=== Verifying an individual example ===
+
+This will require you using the verify script, and providing the necessary sub
+script(s) it will utilize in the process. Please note that it is your
+responsibility to setup the necessary environment for the verification process
Propchange: incubator/qpid/trunk/qpid/cpp/examples/README.verify
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/examples/README.verify
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: incubator/qpid/trunk/qpid/cpp/examples/direct/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 20 14:23:23 2008
@@ -0,0 +1,4 @@
+declare_queues
+direct_producer
+listener
+Makefile.in
Added: incubator/qpid/trunk/qpid/cpp/examples/direct/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/direct/Makefile.am?rev=670066&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/direct/Makefile.am (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/direct/Makefile.am Fri Jun 20
14:23:23 2008
@@ -0,0 +1,29 @@
+examplesdir=$(pkgdatadir)/examples/direct
+
+include $(top_srcdir)/examples/makedist.mk
+
+noinst_PROGRAMS=direct_producer listener declare_queues
+direct_producer_SOURCES=direct_producer.cpp
+direct_producer_LDADD=$(CLIENT_LIB)
+
+listener_SOURCES=listener.cpp
+listener_LDADD=$(CLIENT_LIB)
+
+declare_queues_SOURCES=declare_queues.cpp
+declare_queues_LDADD=$(CLIENT_LIB)
+
+examples_DATA= \
+ direct_producer.cpp \
+ listener.cpp \
+ declare_queues.cpp \
+ $(MAKEDIST)
+
+EXTRA_DIST= \
+ $(examples_DATA) \
+ verify \
+ verify.in \
+ verify_cpp_python \
+ verify_cpp_python.in \
+ verify_python_cpp \
+ verify_python_cpp.in
+
Propchange: incubator/qpid/trunk/qpid/cpp/examples/fanout/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 20 14:23:23 2008
@@ -0,0 +1,4 @@
+declare_queues
+fanout_producer
+listener
+Makefile.in
Added: incubator/qpid/trunk/qpid/cpp/examples/fanout/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/fanout/Makefile.am?rev=670066&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/fanout/Makefile.am (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/fanout/Makefile.am Fri Jun 20
14:23:23 2008
@@ -0,0 +1,29 @@
+examplesdir=$(pkgdatadir)/examples/fanout
+
+include $(top_srcdir)/examples/makedist.mk
+
+noinst_PROGRAMS=fanout_producer listener
+fanout_producer_SOURCES=fanout_producer.cpp
+fanout_producer_LDADD=$(CLIENT_LIB)
+
+listener_SOURCES=listener.cpp
+listener_LDADD=$(CLIENT_LIB)
+
+examples_DATA= \
+ fanout_producer.cpp \
+ listener.cpp \
+ $(MAKEDIST)
+
+EXTRA_DIST= \
+ $(examples_DATA) \
+ verify \
+ verify.in \
+ verify_cpp_python \
+ verify_cpp_python.in \
+ verify_python_cpp \
+ verify_python_cpp.in
+
+
+
+
+
Added: incubator/qpid/trunk/qpid/cpp/examples/makedist.mk
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/makedist.mk?rev=670066&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/makedist.mk (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/makedist.mk Fri Jun 20 14:23:23 2008
@@ -0,0 +1,20 @@
+# Settings to build the examples in automake
+AM_CXXFLAGS = $(WARNING_CFLAGS)
+INCLUDES = -I$(abs_top_srcdir)/src -I$(abs_top_srcdir)/src/gen
-I$(abs_top_builddir)/src -I$(abs_top_builddir)/src/gen
+CLIENT_LIB=$(abs_top_builddir)/src/libqpidclient.la
+
+# Generate a simple non-automake Makefile for distribution.
+MAKEDIST=.libs/Makefile
+
+$(MAKEDIST): Makefile
+ @$(MKDIR_P) .libs
+ @$(ECHO) CXX=$(CXX) > $(MAKEDIST)
+ @$(ECHO) CXXFLAGS=$(CXXFLAGS) >> $(MAKEDIST)
+ @$(ECHO) LDFLAGS=-lqpidclient >> $(MAKEDIST)
+ @$(ECHO) >> $(MAKEDIST)
+ @$(ECHO) all: $(noinst_PROGRAMS) >> $(MAKEDIST)
+ @$(ECHO) >> $(MAKEDIST)
+ @$(ECHO) clean: >> $(MAKEDIST)
+ @$(ECHO) " rm -f $(noinst_PROGRAMS)" >> $(MAKEDIST)
+
+
Propchange: incubator/qpid/trunk/qpid/cpp/examples/pub-sub/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 20 14:23:23 2008
@@ -0,0 +1,4 @@
+topic_config_queues
+topic_listener
+topic_publisher
+Makefile.in
Added: incubator/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am?rev=670066&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am Fri Jun 20
14:23:23 2008
@@ -0,0 +1,30 @@
+examplesdir=$(pkgdatadir)/examples/pub-sub
+
+include $(top_srcdir)/examples/makedist.mk
+
+noinst_PROGRAMS=topic_listener topic_publisher
+
+topic_listener_SOURCES=topic_listener.cpp
+topic_listener_LDADD=$(CLIENT_LIB)
+
+topic_publisher_SOURCES=topic_publisher.cpp
+topic_publisher_LDADD=$(CLIENT_LIB)
+
+examples_DATA= \
+ topic_listener.cpp \
+ topic_publisher.cpp \
+ $(MAKEDIST)
+
+EXTRA_DIST= \
+ $(examples_DATA) \
+ verify \
+ verify.in \
+ verify_cpp_python \
+ verify_cpp_python.in \
+ verify_python_cpp \
+ verify_python_cpp.in
+
+
+
+
+
Propchange: incubator/qpid/trunk/qpid/cpp/examples/request-response/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 20 14:23:23 2008
@@ -0,0 +1,3 @@
+client
+server
+Makefile.in
Added: incubator/qpid/trunk/qpid/cpp/examples/request-response/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/request-response/Makefile.am?rev=670066&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/request-response/Makefile.am (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/request-response/Makefile.am Fri Jun
20 14:23:23 2008
@@ -0,0 +1,30 @@
+examplesdir=$(pkgdatadir)/examples/request-response
+
+include $(top_srcdir)/examples/makedist.mk
+
+noinst_PROGRAMS=client server
+
+client_SOURCES=client.cpp
+client_LDADD=$(CLIENT_LIB)
+
+server_SOURCES=server.cpp
+server_LDADD=$(CLIENT_LIB)
+
+examples_DATA= \
+ server.cpp \
+ client.cpp \
+ $(MAKEDIST)
+
+EXTRA_DIST= \
+ $(examples_DATA) \
+ verify \
+ verify.in \
+ verify_cpp_python \
+ verify_cpp_python.in \
+ verify_python_cpp \
+ verify_python_cpp.in
+
+
+
+
+
Modified: incubator/qpid/trunk/qpid/cpp/examples/verify
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify Fri Jun 20 14:23:23 2008
@@ -8,7 +8,8 @@
# If $QPID_HOST or $QPID_PORT are set, use them to connect.
#
-export QPID_DATA_DIR=
+QPID_DATA_DIR=
+export QPID_DATA_DIR
cleanup() {
test -n "$QPIDD" && $QPIDD -q # Private broker
Modified: incubator/qpid/trunk/qpid/cpp/examples/verify_all
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify_all?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify_all Fri Jun 20 14:23:23 2008
@@ -9,9 +9,10 @@
python=${QPID_PYTHON_DIR:-$topsrcdir/python}
trap "$qpidd -q" exit
-export QPID_PORT=`$qpidd -dp0 --no-module-dir --data-dir "" --auth no` || {
echo "Can't run qpidd" ; exit 1; }
-export PYTHON_EXAMPLES=$python/examples
-export PYTHONPATH=$python:$PYTHONPATH
+QPID_PORT=`$qpidd -dp0 --no-module-dir --data-dir "" --auth no` || { echo
"Can't run qpidd" ; exit 1; }
+PYTHON_EXAMPLES=$python/examples
+PYTHONPATH=$python:$PYTHONPATH
+export QPID_PORT PYTHON_EXAMPLES PYTHONPATH
test -d $PYTHON_EXAMPLES || echo "WARNING: No python examples.
$PYTHON_EXAMPLES not found."
find="find examples"
Propchange: incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 20 14:23:23 2008
@@ -0,0 +1,4 @@
+declare_queues
+listener
+xml_producer
+Makefile.in
Added: incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am?rev=670066&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am Fri Jun 20
14:23:23 2008
@@ -0,0 +1,29 @@
+examplesdir=$(pkgdatadir)/examples/xml-exchange
+
+include $(top_srcdir)/examples/makedist.mk
+
+noinst_PROGRAMS=declare_queues xml_producer listener
+
+declare_queues_SOURCES=declare_queues.cpp
+declare_queues_LDADD=$(CLIENT_LIB)
+
+xml_producer_SOURCES=xml_producer.cpp
+xml_producer_LDADD=$(CLIENT_LIB)
+
+listener_SOURCES=listener.cpp
+listener_LDADD=$(CLIENT_LIB)
+
+EXTRA_DIST= \
+ README
+
+examples_DATA= \
+ $(EXTRA_DIST) \
+ declare_queues.cpp \
+ listener.cpp \
+ xml_producer.cpp \
+ $(MAKEDIST)
+
+
+
+
+
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Fri Jun 20 14:23:23 2008
@@ -318,7 +318,6 @@
qpid/client/Connector.cpp \
qpid/client/Connection.cpp \
qpid/client/ConnectionHandler.cpp \
- qpid/client/ChainableFrameHandler.h \
qpid/client/ConnectionSettings.cpp \
qpid/client/Demux.cpp \
qpid/client/Dispatcher.cpp \
@@ -434,6 +433,7 @@
qpid/client/AckMode.h \
qpid/client/AckPolicy.h \
qpid/client/Bounds.h \
+ qpid/client/ChainableFrameHandler.h \
qpid/client/Completion.h \
qpid/client/Connection.h \
qpid/client/ConnectionHandler.h \
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Fri Jun 20 14:23:23 2008
@@ -131,7 +131,6 @@
topictest \
run_federation_tests \
.valgrind.supp \
- .valgrindrc \
MessageUtils.h \
TestMessageStore.h \
MockConnectionInputHandler.h \
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk Fri Jun 20 14:23:23 2008
@@ -11,7 +11,7 @@
# ais_check checks conditions for AIS tests and runs if ok.
TESTS+=ais_check
-EXTRA_DIST+=ais_check ais_run
+EXTRA_DIST+=ais_check ais_run start_cluster stop_cluster
check_PROGRAMS+=ais_test
ais_test_SOURCES=ais_test.cpp Cpg.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/run_test
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/run_test?rev=670066&r1=670065&r2=670066&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/run_test (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/run_test Fri Jun 20 14:23:23 2008
@@ -14,34 +14,42 @@
srcdir=`dirname $0`
source $srcdir/vg_check
-test -f .valgrindrc || cp $srcdir/.valgrindrc .
-test -f .valgrind.supp || cp $srcdir/.valgrind.supp .
-
# Export variables from makefile.
export VALGRIND srcdir
-# Export QPID_PORT if qpidd.port exists.
-test -f qpidd.port && export QPID_PORT=`cat qpidd.port`
+# Set QPID_PORT if qpidd.port exists.
+test -f qpidd.port && QPID_PORT=`cat qpidd.port`
+export QPID_PORT
# Avoid silly libtool error messages if these are not defined
-test -z "$LC_ALL" && export LC_ALL=
-test -z "$LC_CTYPE" && export LC_CTYPE=
-test -z "$LC_COLLATE" && export LC_COLLATE=
-test -z "$LC_MESSAGES" && export LC_MESSAGES=
+test -z "$LC_ALL" && LC_ALL=
+test -z "$LC_CTYPE" && LC_CTYPE=
+test -z "$LC_COLLATE" && LC_COLLATE=
+test -z "$LC_MESSAGES" && LC_MESSAGES=
+export LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
VG_LOG="$1.vglog"
rm -f $VG_LOG*
+VALGRIND_OPTS="
+--gen-suppressions=all
+--leak-check=full
+--demangle=yes
+--suppressions=$srcdir/.valgrind.supp
+--num-callers=25
+--trace-children=yes
+--log-file=$VG_LOG --
+"
+
if grep -l "^# Generated by .*libtool" "$1" >/dev/null 2>&1; then
# This is a libtool "executable". Valgrind it if VALGRIND specified.
- test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=$VG_LOG --"
+ test -n "$VALGRIND" && VALGRIND="$VALGRIND $VALGRIND_OPTS"
# Hide output unless there's an error.
libtool --mode=execute $VALGRIND "$@" 2>&1 || ERROR=$?
test -n "$VALGRIND" && vg_check $VG_LOG*
else
# This is a non-libtool shell script, just execute it.
- export VALGRIND srcdir
exec "$@"
fi
