2006-12-01 Jim Meyering <meyering@redhat.com>

This delta imposes two major changes on the C++ hierarchy:
  - adds autoconf, automake, libtool support
  - makes the hierarchy flatter and renames a few files (e.g., Queue.h,
  Queue.cpp) that appeared twice, once under client/ and again under broker/.

In the process, I've changed many #include directives, mostly
to remove a qpid/ or qpid/framing/ prefix from the file name argument.
Although most changes were to .cpp and .h files under qpid/cpp/, there
were also several to template files under qpid/gentools, and even one
to CppGenerator.java.

Nearly all files are moved to a new position in the hierarchy.
The new hierarchy looks like this:

  src               # this is the new home of qpidd.cpp
  tests             # all tests are here.  See Makefile.am.
  gen               # As before, all generated files go here.
  lib               # This is just a container for the 3 lib dirs:
  lib/client
  lib/broker
  lib/common
  lib/common/framing
  lib/common/sys
  lib/common/sys/posix
  lib/common/sys/apr
  build-aux
  m4


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@481159 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 100 insertions, 0 deletions

diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am
new file mode 100644
index 0000000000..8c7acc067d
--- /dev/null
+++ b/cpp/tests/Makefile.am
@@ -0,0 +1,100 @@
+# TODO aconway 2006-11-30: nasty hack, should be done by automake?
+abs_builddir = @abs_builddir@
+
+AM_CXXFLAGS = $(WARNING_CFLAGS)
+INCLUDES = \
+  -I$(top_srcdir)/gen \
+  -I$(top_srcdir)/lib \
+  -I$(top_srcdir)/lib/client \
+  -I$(top_srcdir)/lib/broker \
+  -I$(top_srcdir)/lib/common \
+  -I$(top_srcdir)/lib/common/sys \
+  -I$(top_srcdir)/lib/common/framing
+
+# FIXME: -lcppunit must come from autoconf
+
+# FIXME: have e.g., topicall, run as part of "make check"?
+EXTRA_DIST =		\
+  env			\
+  broker		\
+  topicall		\
+  topictest		\
+  qpid_test_plugin.h	\
+  APRBaseTest.cpp
+
+client_tests =		\
+  client_test		\
+  echo_service		\
+  topic_listener	\
+  topic_publisher
+
+broker_tests =		\
+  AccumulatedAckTest	\
+  ChannelTest		\
+  ConfigurationTest	\
+  ExchangeTest		\
+  HeadersExchangeTest	\
+  InMemoryContentTest	\
+  LazyLoadedContentTest	\
+  MessageBuilderTest	\
+  MessageTest		\
+  QueueRegistryTest	\
+  QueueTest		\
+  TopicExchangeTest	\
+  TxAckTest		\
+  TxBufferTest		\
+  TxPublishTest		\
+  ValueTest
+
+framing_tests =		\
+  BodyHandlerTest	\
+  FieldTableTest	\
+  FramingTest		\
+  HeaderTest
+
+misc_tests =		\
+  ExceptionTest
+
+posix_tests =		\
+  EventChannelTest	\
+  EventChannelThreadsTest
+
+unit_tests =		\
+  $(broker_tests)	\
+  $(framing_tests)	\
+  $(misc_tests)		\
+  $(posix_tests)
+
+noinst_PROGRAMS = $(client_tests)
+
+check: run-unit-tests
+
+.PHONY: run-unit-tests
+run-unit-tests: $(check_LTLIBRARIES)
+	DllPlugInTester -c -b .libs/*.so
+
+include gen.mk
+
+extra_libs = -lcppunit
+lib_client = ../lib/client/libclient.la
+lib_common = ../lib/common/libcommon.la
+lib_broker = ../lib/broker/libbroker.la
+
+gen.mk: Makefile.am
+	(					\
+	  for i in $(client_tests); do		\
+	    echo $${i}_SOURCES = $$i.cpp;	\
+	    echo $${i}_LDADD = '$$(lib_client) $$(lib_common) $$(extra_libs)'; \
+	  done;					\
+	  libs=;				\
+	  for i in $(unit_tests); do		\
+	    libs="$$libs $${i}.la";		\
+	    echo $${i}_la_SOURCES = $$i.cpp;	\
+	    echo $${i}_la_LIBADD = '$$(lib_common)';			\
+	    echo $${i}_la_LIBADD += '$$(lib_broker) $$(extra_libs)';	\
+	    echo $${i}_la_LDFLAGS = '-module -rpath $$(abs_builddir)';	\
+	  done;					\
+	  echo "check_LTLIBRARIES =$$libs";	\
+	)					\
+	> $@-t
+	mv $@-t $@