diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-11 19:53:32 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-11 19:53:32 +0000 |
| commit | 1fd57585c8ea536630d69de3fc16ce0c6f81c82b (patch) | |
| tree | dc6a92d539d14a333c5033938d13b08edad9c9b9 /cpp | |
| parent | f7f31c6a720d23749b23735b71cd401d93ded9b5 (diff) | |
| download | qpid-python-1fd57585c8ea536630d69de3fc16ce0c6f81c82b.tar.gz | |
* cpp/qpidc.spec.in: Added qpidd-devel sub-package.
* cpp/configure.ac: Use a more reliable srcdir test file.
* cpp/docs/api/Makefile.am: Fix bug in VPATH builds.
* cpp/gentools/*, src/**.h,**.cpp: Fix #includes of files in gen/
* cpp/rpm/Makefile.am: Removed. RPM targets defined in top level Makefile.am.
* cpp/Makefile.am: Add RPM targets, fix VPATH bug with RPM targets
* cpp/rpm/README.qpidd-devel: placeholder for qpidd-devel documentation.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527639 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
42 files changed, 154 insertions, 124 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 1d6c142109..dcdcb7cea0 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -1,13 +1,15 @@ AUTOMAKE_OPTIONS = 1.9.2 foreign ACLOCAL_AMFLAGS = -I m4 +SPEC=$(PACKAGE).spec + EXTRA_DIST = \ LICENSE NOTICE README \ etc/qpidd \ - $(PACKAGE).spec \ - $(PACKAGE).spec.in + $(SPEC) $(SPEC).in \ + rpm/README.qpidd-devel -SUBDIRS = src docs/api docs/man rpm +SUBDIRS = src docs/api docs/man # Update libtool, if needed. libtool: $(LIBTOOL_DEPS) @@ -16,11 +18,31 @@ libtool: $(LIBTOOL_DEPS) # This cannot be done by AC_CONFIG_FILES, because automake's # make distcheck target does not like auto-generated files # being included in the distributed archive. -$(PACKAGE).spec: %: %.in +$(SPEC): %: %.in Makefile sed 's/@''PACKAGE@/@PACKAGE@/;s/@''VERSION@/@VERSION@/' $< > $@-tmp mv $@-tmp $@ -MAINTAINERCLEANFILES = $(PACKAGE).spec +MAINTAINERCLEANFILES = $(SPEC) + +# +# Build RPMs from the distribution tarball. +# +RPMDIRS=rpm/BUILD rpm/RPMS rpm/SPECS rpm/SRPMS +RPMMACROS=--define "_topdir @abs_builddir@/rpm" --define "_sourcedir @abs_builddir@" +# Override this variable e.g. with -bs to produce srpm only +RPMOPTS=-ba + +clean-local: + -rm -rf $(RPMDIRS) + +.PHONY: rpmbuild + +rpmbuild: $(SPEC) dist-gzip + mkdir -p $(RPMDIRS) + rpmbuild $(RPMMACROS) $(RPMOPTS) $(SPEC) +if HAS_RPMLINT + rpmlint `find rpm -name '*.rpm'` +else + @echo "WARNING: rpmlint not found, could not validate RPMs." +endif + -.PHONY: rpm srpm -rpm srpm: dist - cd rpm && $(MAKE) $(MAKEFLAGS_AM) $@ diff --git a/cpp/README b/cpp/README index 295d27d279..11a913e04d 100644 --- a/cpp/README +++ b/cpp/README @@ -1,12 +1,12 @@ = Qpid C++ = Qpid C++ is a C++ implementation of the AMQP protcol described at - http://amqp.org/ + http://amqp.org/ The Qpid project also provides Java, Ruby and Python implementations. For additional software or information on the Qpid project go to: - http://incubator.apache.org/qpid/index.html + http://cwiki.apache.org/qpid/ Available documentation: diff --git a/cpp/configure.ac b/cpp/configure.ac index 53989dcdbc..bf0001226a 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -16,7 +16,7 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AC_PREREQ(2.59) AC_CONFIG_HEADERS([config.h:config.in]) -AC_CONFIG_SRCDIR([src/broker/Broker.cpp]) +AC_CONFIG_SRCDIR([qpidc.spec.in]) AC_PROG_CC_STDC #AM_PROG_CC_C_O @@ -41,7 +41,7 @@ AC_CHECK_PROGS([JAVAC], [javac], [no]) build=yes test x$JAVA = xno && build=no test x$JAVAC = xno && build=no -test -d $srcdir/../gentools || build=no +test -d $srcdir/gentools || build=no test -d $srcdir/../specs || build=no AM_CONDITIONAL([CAN_GENERATE_CODE], [test x$build = xyes]) @@ -136,6 +136,10 @@ AC_ARG_ENABLE(valgrind, AC_CHECK_PROG([VALGRIND], [valgrind], [valgrind]) test "$enable_VALGRIND" = no && VALGRIND= +# If rpmlint is availalbe we'll run it when building RPMs. +AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint]) +AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"]) + AC_CONFIG_FILES([ Makefile src/Makefile @@ -144,7 +148,6 @@ AC_CONFIG_FILES([ docs/api/Makefile docs/api/user.doxygen docs/api/developer.doxygen - rpm/Makefile ]) AC_OUTPUT diff --git a/cpp/docs/api/Makefile.am b/cpp/docs/api/Makefile.am index cd54e20d60..c1cc118d58 100644 --- a/cpp/docs/api/Makefile.am +++ b/cpp/docs/api/Makefile.am @@ -13,10 +13,12 @@ headers: $(src)/*.h $(src)/*/*.h $(src)/*/*/*.h sources: $(src)/*.cpp $(src)/*/*.cpp $(src)/*/*/*.cpp html: headers user.doxygen - doxygen $(srcdir)/user.doxygen + doxygen user.doxygen + touch $@ html-dev: headers sources developer.doxygen - doxygen $(srcdir)/developer.doxygen + doxygen developer.doxygen + touch $@ clean-local: rm -rf html html-dev diff --git a/cpp/docs/api/user.doxygen.in b/cpp/docs/api/user.doxygen.in index 9084cbd679..5c390cc9c8 100644 --- a/cpp/docs/api/user.doxygen.in +++ b/cpp/docs/api/user.doxygen.in @@ -456,7 +456,7 @@ WARN_FORMAT = "$file:$line: $text" # and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = doxygen.log #--------------------------------------------------------------------------- # configuration options related to the input files diff --git a/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java index b46d6e8cfc..26b189a1ff 100644 --- a/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java +++ b/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java @@ -1103,8 +1103,8 @@ public class CppGenerator extends Generator for (String thisMethodName : thisClass.methodMap.keySet()) { AmqpMethod method = thisClass.methodMap.get(thisMethodName); - sb.append(indent + "#include <" + thisClass.name + - Utils.firstUpper(method.name) + "Body.h>" + cr); + sb.append(indent + "#include \"" + thisClass.name + + Utils.firstUpper(method.name) + "Body.h\"" + cr); } return sb.toString(); } diff --git a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl index c41ca3406d..d85f4bf229 100644 --- a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl +++ b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl @@ -46,7 +46,7 @@ public: virtual ProtocolVersion getVersion() const = 0; // Include framing constant declarations - #include <AMQP_Constants.h> + #include "AMQP_Constants.h" // Inner classes diff --git a/cpp/qpidc.spec.in b/cpp/qpidc.spec.in index 9b7cb4ef91..130654dae6 100644 --- a/cpp/qpidc.spec.in +++ b/cpp/qpidc.spec.in @@ -1,11 +1,11 @@ # -# Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd +# Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd, qpidd-devel # -%define daemon qpidd +%define qpidd qpidd Name: @PACKAGE@ Version: @VERSION@ -Release: 4%{?dist} +Release: 5%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: Apache Software License @@ -48,15 +48,25 @@ Requires: cppunit-devel Libraries, header files and documentation for developing AMQP clients in C++ using Qpid. Qpid implements the AMQP messaging specification. -%package -n %{daemon} +%package -n %{qpidd} Summary: An AMQP message broker daemon Group: System Environment/Daemons Requires: %name = %version-%release -%description -n %{daemon} +%description -n %{qpidd} A message broker daemon that receives stores and routes messages using the open AMQP messaging protocol. +%package -n %{qpidd}-devel +Summary: Libraries and header files for developing Qpid broker extensions +Group: Development/System +Requires: %name-devel = %version-%release +Requires: %{qpidd} = %version-%release + +%description -n %{qpidd}-devel +Libraries and header files for developing extensions to the +Qpid broker daemon. + %prep %setup -q @@ -72,9 +82,6 @@ make install DESTDIR=%{buildroot} install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd rm -f %{buildroot}%_libdir/*.a rm -f %{buildroot}%_libdir/*.la -# There's no qpidd-devel package so no .so for the broker needed. -rm -f %{buildroot}%_libdir/libqpidbroker.so - %clean rm -rf %{buildroot} @@ -92,37 +99,46 @@ make check %files devel %defattr(-,root,root,-) -%_includedir/qpidc +%_includedir/qpid/*.h +%_includedir/qpid/client +%_includedir/qpid/framing +%_includedir/qpid/gen +%_includedir/qpid/sys %_libdir/libqpidcommon.so %_libdir/libqpidclient.so %doc docs/api/html -# We don't need this perl script and it causes rpmlint to complain. -# There is probably a more polite way of calculating the devel docdir. -%files -n %{daemon} +%files -n %{qpidd} +%defattr(-,root,root,-) %_libdir/libqpidbroker.so.0 %_libdir/libqpidbroker.so.0.1.0 -%_sbindir/%{daemon} -%{_initrddir}/qpidd -%doc %_mandir/man1/%{daemon}.* +%_sbindir/%{qpidd} +%{_initrddir}/%{qpidd} +%doc %_mandir/man1/%{qpidd}.* + +%files -n %{qpidd}-devel +%doc rpm/README.qpidd-devel +%defattr(-,root,root,-) +%_libdir/libqpidbroker.so +%_includedir/qpid/broker %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post -n %{daemon} +%post -n %{qpidd} # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add qpidd /sbin/ldconfig -%preun -n %{daemon} +%preun -n %{qpidd} # Check that this is actual deinstallation, not just removing for upgrade. if [ $1 = 0 ]; then /sbin/service qpidd stop >/dev/null 2>&1 || : /sbin/chkconfig --del qpidd fi -%postun -n %{daemon} +%postun -n %{qpidd} if [ "$1" -ge "1" ]; then /sbin/service qpidd condrestart >/dev/null 2>&1 || : fi @@ -130,6 +146,9 @@ fi %changelog +* Wed Apr 11 2007 Alan Conway <aconway@redhat.com> - 0.1-5 +- Add qpidd-devel sub-package. + * Mon Feb 19 2007 Jim Meyering <meyering@redhat.com> - 0.1-4 - Address http://bugzilla.redhat.com/220630: - Remove redundant "cppunit" build-requires. @@ -145,3 +164,4 @@ fi * Fri Dec 8 2006 David Lutterkort <dlutter@redhat.com> - 0.1-1 - Initial version based on Jim Meyering's sketch and discussions with Alan Conway + diff --git a/cpp/rpm/Makefile.am b/cpp/rpm/Makefile.am deleted file mode 100644 index ddcbea868c..0000000000 --- a/cpp/rpm/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# -# Build RPMs from the distribution tarball. -# - -SPEC=${top_srcdir}/qpidc.spec -RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir}" -DIRS="BUILD RPMS SOURCES SPECS SRPMS" - -clean-local: - -rm -rf $(DIRS) - -.PHONY: rpm srpm - -# Build source and binary RPMs. -rpm: $(DIRS) - rpmbuild $(RPMOPTS) $(RPMEXTRAOPTS) -ba $(SPEC) - rpmlint RPMS/*/*.rpm - -# Build source RPM only. -srpm: $(DIRS) - rpmbuild $(RPMOPTS) -bs $(SPEC) - -$(DIRS): - mkdir -p $(DIRS) - - diff --git a/cpp/rpm/README.qpidd-devel b/cpp/rpm/README.qpidd-devel new file mode 100644 index 0000000000..fd13120f66 --- /dev/null +++ b/cpp/rpm/README.qpidd-devel @@ -0,0 +1,11 @@ + +This package provides header files needed to implement extensions to +the Qpid broker daemon. It is not require for normal use of Qpid. + +Support for broker extensions is still a work-in-progress. We will be +providing API documentation soon, in the meantime go to: + + http://cwiki.apache.org/qpid/ + +for more information. + diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index c18eb4f719..32c2e1a00d 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = . tests AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) # -I top_builddir for config.h -INCLUDES = -I$(top_builddir) -I$(srcdir)/gen +INCLUDES = -I$(top_builddir) -I$(srcdir) qpidd_LDADD = \ libqpidbroker.la \ @@ -156,7 +156,9 @@ libqpidclient_la_SOURCES = \ $(client)/ResponseHandler.cpp \ $(client)/ReturnedMessageHandler.cpp -nobase_pkginclude_HEADERS = \ +# Install into include/qpid rather than include/qpidc. +qpidincludedir=$(includedir)/qpid +nobase_qpidinclude_HEADERS = \ $(generated_headers) \ $(platform_hdr) \ $(broker)/AccumulatedAck.h \ @@ -280,14 +282,11 @@ nobase_pkginclude_HEADERS = \ ExceptionHolder.h \ QpidError.h \ SharedObject.h \ - doxygen_mainpage.h \ shared_ptr.h # Distribute the generated sources, at least for now, since # the generator code is in java. EXTRA_DIST += $(BUILT_SOURCES) -maintainer-clean-local: - rm -rf $(gen) # Don't attempt to run the code generator unless configure has set # CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed @@ -297,12 +296,7 @@ if CAN_GENERATE_CODE gentools_dir = $(srcdir)/../gentools spec_dir = $(srcdir)/../../specs - -# FIXME aconway 2007-01-04: Enabling Basic class until -# new messaging class is ready to replace it. -# spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml $(spec_dir)/amqp-nogen.0-9.xml spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml - gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools $(BUILT_SOURCES) $(gen)/timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am diff --git a/cpp/src/broker/BrokerAdapter.h b/cpp/src/broker/BrokerAdapter.h index 4af45162f0..0323cbad20 100644 --- a/cpp/src/broker/BrokerAdapter.h +++ b/cpp/src/broker/BrokerAdapter.h @@ -18,7 +18,7 @@ * limitations under the License. * */ -#include "AMQP_ServerOperations.h" +#include "../gen/AMQP_ServerOperations.h" #include "HandlerImpl.h" #include "MessageHandlerImpl.h" #include "../Exception.h" diff --git a/cpp/src/broker/BrokerChannel.h b/cpp/src/broker/BrokerChannel.h index e2a96aa467..fb090196c2 100644 --- a/cpp/src/broker/BrokerChannel.h +++ b/cpp/src/broker/BrokerChannel.h @@ -36,7 +36,7 @@ #include "Prefetch.h" #include "TxBuffer.h" #include "../framing/ChannelAdapter.h" -#include "ChannelOpenBody.h" +#include "../gen/ChannelOpenBody.h" #include "CompletionHandler.h" namespace qpid { diff --git a/cpp/src/broker/BrokerMessage.cpp b/cpp/src/broker/BrokerMessage.cpp index 06765bcaa9..96a90ef608 100644 --- a/cpp/src/broker/BrokerMessage.cpp +++ b/cpp/src/broker/BrokerMessage.cpp @@ -26,8 +26,8 @@ #include "InMemoryContent.h" #include "LazyLoadedContent.h" #include "MessageStore.h" -#include "BasicDeliverBody.h" -#include "BasicGetOkBody.h" +#include "../gen/BasicDeliverBody.h" +#include "../gen/BasicGetOkBody.h" #include "../framing/AMQContentBody.h" #include "../framing/AMQHeaderBody.h" #include "../framing/AMQMethodBody.h" diff --git a/cpp/src/broker/BrokerMessageMessage.cpp b/cpp/src/broker/BrokerMessageMessage.cpp index e34cd61f6c..7a2fa31343 100644 --- a/cpp/src/broker/BrokerMessageMessage.cpp +++ b/cpp/src/broker/BrokerMessageMessage.cpp @@ -21,10 +21,10 @@ #include "../QpidError.h" #include "BrokerMessageMessage.h" #include "../framing/ChannelAdapter.h" -#include "MessageTransferBody.h" -#include "MessageOpenBody.h" -#include "MessageCloseBody.h" -#include "MessageAppendBody.h" +#include "../gen/MessageTransferBody.h" +#include "../gen/MessageOpenBody.h" +#include "../gen/MessageCloseBody.h" +#include "../gen/MessageAppendBody.h" #include "Reference.h" #include "../framing/AMQFrame.h" #include "../framing/FieldTable.h" diff --git a/cpp/src/broker/BrokerMessageMessage.h b/cpp/src/broker/BrokerMessageMessage.h index 976b882c7e..ae9fc9c2c0 100644 --- a/cpp/src/broker/BrokerMessageMessage.h +++ b/cpp/src/broker/BrokerMessageMessage.h @@ -22,7 +22,7 @@ * */ #include "BrokerMessageBase.h" -#include "MessageTransferBody.h" +#include "../gen/MessageTransferBody.h" #include "../framing/amqp_types.h" #include <boost/weak_ptr.hpp> #include <vector> diff --git a/cpp/src/broker/Connection.cpp b/cpp/src/broker/Connection.cpp index dbc8149cb5..ab1c2ac128 100644 --- a/cpp/src/broker/Connection.cpp +++ b/cpp/src/broker/Connection.cpp @@ -23,7 +23,7 @@ #include "Connection.h" #include "BrokerChannel.h" -#include "AMQP_ClientProxy.h" +#include "../gen/AMQP_ClientProxy.h" #include "BrokerAdapter.h" using namespace boost; diff --git a/cpp/src/broker/Connection.h b/cpp/src/broker/Connection.h index a36f1aa6ee..ffda0425cc 100644 --- a/cpp/src/broker/Connection.h +++ b/cpp/src/broker/Connection.h @@ -27,8 +27,8 @@ #include <boost/ptr_container/ptr_map.hpp> #include "../framing/AMQFrame.h" -#include "AMQP_ServerOperations.h" -#include "AMQP_ClientProxy.h" +#include "../gen/AMQP_ServerOperations.h" +#include "../gen/AMQP_ClientProxy.h" #include "../sys/ConnectionOutputHandler.h" #include "../sys/ConnectionInputHandler.h" #include "../sys/TimeoutHandler.h" diff --git a/cpp/src/broker/HandlerImpl.h b/cpp/src/broker/HandlerImpl.h index c55a36da45..51175f868a 100644 --- a/cpp/src/broker/HandlerImpl.h +++ b/cpp/src/broker/HandlerImpl.h @@ -20,7 +20,7 @@ */ #include "BrokerChannel.h" -#include "AMQP_ClientProxy.h" +#include "../gen/AMQP_ClientProxy.h" namespace qpid { diff --git a/cpp/src/broker/MessageBuilder.h b/cpp/src/broker/MessageBuilder.h index ffac707f3b..85de2e47bc 100644 --- a/cpp/src/broker/MessageBuilder.h +++ b/cpp/src/broker/MessageBuilder.h @@ -28,7 +28,7 @@ #include "MessageStore.h" #include "../framing/AMQContentBody.h" #include "../framing/AMQHeaderBody.h" -#include "BasicPublishBody.h" +#include "../gen/BasicPublishBody.h" #include "CompletionHandler.h" namespace qpid { diff --git a/cpp/src/broker/MessageHandlerImpl.cpp b/cpp/src/broker/MessageHandlerImpl.cpp index 2378047054..e5e5581ac4 100644 --- a/cpp/src/broker/MessageHandlerImpl.cpp +++ b/cpp/src/broker/MessageHandlerImpl.cpp @@ -23,8 +23,8 @@ #include "Connection.h" #include "Broker.h" #include "BrokerMessageMessage.h" -#include "MessageAppendBody.h" -#include "MessageTransferBody.h" +#include "../gen/MessageAppendBody.h" +#include "../gen/MessageTransferBody.h" #include "BrokerAdapter.h" namespace qpid { diff --git a/cpp/src/broker/MessageHandlerImpl.h b/cpp/src/broker/MessageHandlerImpl.h index 872d429d5c..a5647200d3 100644 --- a/cpp/src/broker/MessageHandlerImpl.h +++ b/cpp/src/broker/MessageHandlerImpl.h @@ -21,8 +21,8 @@ #include <memory> -#include "AMQP_ServerOperations.h" -#include "AMQP_ClientProxy.h" +#include "../gen/AMQP_ServerOperations.h" +#include "../gen/AMQP_ClientProxy.h" #include "Reference.h" #include "HandlerImpl.h" diff --git a/cpp/src/broker/Reference.cpp b/cpp/src/broker/Reference.cpp index 1ef2eb44d0..b0b2d8a3c1 100644 --- a/cpp/src/broker/Reference.cpp +++ b/cpp/src/broker/Reference.cpp @@ -20,7 +20,7 @@ #include "Reference.h" #include "BrokerMessageMessage.h" #include "../QpidError.h" -#include "MessageAppendBody.h" +#include "../gen/MessageAppendBody.h" #include "CompletionHandler.h" namespace qpid { diff --git a/cpp/src/client/ClientAdapter.cpp b/cpp/src/client/ClientAdapter.cpp index 4bf91f915b..f5eb2f4536 100644 --- a/cpp/src/client/ClientAdapter.cpp +++ b/cpp/src/client/ClientAdapter.cpp @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "AMQP_ClientOperations.h" +#include "../gen/AMQP_ClientOperations.h" #include "ClientAdapter.h" #include "Connection.h" #include "../Exception.h" diff --git a/cpp/src/framing/AMQFrame.h b/cpp/src/framing/AMQFrame.h index d4c2e0640d..d31df4cc41 100644 --- a/cpp/src/framing/AMQFrame.h +++ b/cpp/src/framing/AMQFrame.h @@ -30,8 +30,8 @@ #include "AMQHeaderBody.h" #include "AMQContentBody.h" #include "AMQHeartbeatBody.h" -#include "AMQP_MethodVersionMap.h" -#include "AMQP_HighestVersion.h" +#include "../gen/AMQP_MethodVersionMap.h" +#include "../gen/AMQP_HighestVersion.h" #include "Buffer.h" namespace qpid { diff --git a/cpp/src/framing/AMQMethodBody.cpp b/cpp/src/framing/AMQMethodBody.cpp index 44924b76e1..0180d6c372 100644 --- a/cpp/src/framing/AMQMethodBody.cpp +++ b/cpp/src/framing/AMQMethodBody.cpp @@ -21,7 +21,7 @@ #include "AMQFrame.h" #include "AMQMethodBody.h" #include "../QpidError.h" -#include "AMQP_MethodVersionMap.h" +#include "../gen/AMQP_MethodVersionMap.h" namespace qpid { namespace framing { diff --git a/cpp/src/framing/AMQMethodBody.h b/cpp/src/framing/AMQMethodBody.h index c5f0a1adf7..2fb952ddbb 100644 --- a/cpp/src/framing/AMQMethodBody.h +++ b/cpp/src/framing/AMQMethodBody.h @@ -25,7 +25,7 @@ #include "amqp_types.h" #include "AMQBody.h" #include "Buffer.h" -#include "AMQP_ServerOperations.h" +#include "../gen/AMQP_ServerOperations.h" #include "MethodContext.h" namespace qpid { diff --git a/cpp/src/framing/AMQRequestBody.cpp b/cpp/src/framing/AMQRequestBody.cpp index 54e1c11863..bb5a448dc3 100644 --- a/cpp/src/framing/AMQRequestBody.cpp +++ b/cpp/src/framing/AMQRequestBody.cpp @@ -17,7 +17,7 @@ */ #include "AMQRequestBody.h" -#include "AMQP_MethodVersionMap.h" +#include "../gen/AMQP_MethodVersionMap.h" namespace qpid { namespace framing { diff --git a/cpp/src/framing/AMQResponseBody.cpp b/cpp/src/framing/AMQResponseBody.cpp index 7da71a5d25..ad99ab32e0 100644 --- a/cpp/src/framing/AMQResponseBody.cpp +++ b/cpp/src/framing/AMQResponseBody.cpp @@ -18,7 +18,7 @@ #include "AMQFrame.h" #include "AMQResponseBody.h" -#include "AMQP_MethodVersionMap.h" +#include "../gen/AMQP_MethodVersionMap.h" namespace qpid { namespace framing { diff --git a/cpp/src/framing/amqp_framing.h b/cpp/src/framing/amqp_framing.h index 5cbaedb102..c99dd2bb64 100644 --- a/cpp/src/framing/amqp_framing.h +++ b/cpp/src/framing/amqp_framing.h @@ -26,7 +26,7 @@ #include "AMQHeaderBody.h" #include "AMQContentBody.h" #include "AMQHeartbeatBody.h" -#include "AMQP_MethodVersionMap.h" +#include "../gen/AMQP_MethodVersionMap.h" #include "InputHandler.h" #include "OutputHandler.h" #include "InitiationHandler.h" diff --git a/cpp/src/tests/BrokerChannelTest.cpp b/cpp/src/tests/BrokerChannelTest.cpp index 006391bbd2..7d8bbf5e49 100644 --- a/cpp/src/tests/BrokerChannelTest.cpp +++ b/cpp/src/tests/BrokerChannelTest.cpp @@ -26,7 +26,7 @@ #include "qpid_test_plugin.h" #include <iostream> #include <memory> -#include "AMQP_HighestVersion.h" +#include "../gen/AMQP_HighestVersion.h" #include "../framing/AMQFrame.h" #include "MockChannel.h" #include "../broker/Connection.h" diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp index 97846cf527..ff0e6b4ae2 100644 --- a/cpp/src/tests/ExchangeTest.cpp +++ b/cpp/src/tests/ExchangeTest.cpp @@ -26,7 +26,7 @@ #include "../broker/TopicExchange.h" #include "qpid_test_plugin.h" #include <iostream> -#include "BasicGetBody.h" +#include "../gen/BasicGetBody.h" using namespace qpid::broker; using namespace qpid::framing; diff --git a/cpp/src/tests/FramingTest.cpp b/cpp/src/tests/FramingTest.cpp index aa7cd90bc2..24e609e9b9 100644 --- a/cpp/src/tests/FramingTest.cpp +++ b/cpp/src/tests/FramingTest.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "ConnectionRedirectBody.h" +#include "../gen/ConnectionRedirectBody.h" #include "../framing/ProtocolVersion.h" #include "../framing/amqp_framing.h" #include <iostream> @@ -26,7 +26,7 @@ #include <sstream> #include <typeinfo> #include "../QpidError.h" -#include "AMQP_HighestVersion.h" +#include "../gen/AMQP_HighestVersion.h" #include "../framing/AMQRequestBody.h" #include "../framing/AMQResponseBody.h" #include "../framing/Requester.h" @@ -36,7 +36,7 @@ #include "../client/ClientExchange.h" #include "../client/ClientQueue.h" #include "../framing/Correlator.h" -#include "BasicGetOkBody.h" +#include "../gen/BasicGetOkBody.h" #include <memory> #include <boost/lexical_cast.hpp> #include <boost/bind.hpp> diff --git a/cpp/src/tests/InMemoryContentTest.cpp b/cpp/src/tests/InMemoryContentTest.cpp index 6c7dd58258..3dbe31e072 100644 --- a/cpp/src/tests/InMemoryContentTest.cpp +++ b/cpp/src/tests/InMemoryContentTest.cpp @@ -20,7 +20,7 @@ */ #include "../broker/InMemoryContent.h" #include "qpid_test_plugin.h" -#include "AMQP_HighestVersion.h" +#include "../gen/AMQP_HighestVersion.h" #include <iostream> #include <list> #include "../framing/AMQFrame.h" diff --git a/cpp/src/tests/InProcessBroker.h b/cpp/src/tests/InProcessBroker.h index ff94ddbe9f..22af62879a 100644 --- a/cpp/src/tests/InProcessBroker.h +++ b/cpp/src/tests/InProcessBroker.h @@ -18,7 +18,7 @@ * limitations under the License. * */ -#include "AMQP_HighestVersion.h" +#include "../gen/AMQP_HighestVersion.h" #include "../framing/AMQFrame.h" #include "../broker/Broker.h" #include "../broker/Connection.h" diff --git a/cpp/src/tests/LazyLoadedContentTest.cpp b/cpp/src/tests/LazyLoadedContentTest.cpp index 9d0da2206d..f366a25cf9 100644 --- a/cpp/src/tests/LazyLoadedContentTest.cpp +++ b/cpp/src/tests/LazyLoadedContentTest.cpp @@ -19,7 +19,7 @@ * */ #include "../broker/LazyLoadedContent.h" -#include "AMQP_HighestVersion.h" +#include "../gen/AMQP_HighestVersion.h" #include "../broker/NullMessageStore.h" #include "qpid_test_plugin.h" #include <iostream> diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 0c5e43c5ca..62acf3cec6 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -61,16 +61,20 @@ TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) CLIENT_TESTS = client_test quick_topictest TESTS = run-unit-tests start_broker $(CLIENT_TESTS) python_tests kill_broker -EXTRA_DIST = \ - run-unit-tests start_broker python_tests kill_broker \ - .valgrind.supp \ - .valgrindrc-default \ - InProcessBroker.h \ - MockChannel.h \ - MockConnectionInputHandler.h \ - qpid_test_plugin.h \ - test_env \ - topictest \ +EXTRA_DIST = \ + test_env \ + topictest \ + quick_topictest \ + run-unit-tests \ + start_broker \ + python_tests \ + kill_broker \ + .valgrind.supp \ + .valgrindrc-default \ + InProcessBroker.h \ + MockChannel.h \ + MockConnectionInputHandler.h \ + qpid_test_plugin.h \ APRBaseTest.cpp CLEANFILES=qpidd.log diff --git a/cpp/src/tests/MessageHandlerTest.cpp b/cpp/src/tests/MessageHandlerTest.cpp index 277c0fc4b9..4c4321d19d 100644 --- a/cpp/src/tests/MessageHandlerTest.cpp +++ b/cpp/src/tests/MessageHandlerTest.cpp @@ -19,7 +19,7 @@ * */ //#include <iostream> -//#include <AMQP_HighestVersion.h> +//#include "../gen/AMQP_HighestVersion.h> #include "../framing/amqp_framing.h" #include "qpid_test_plugin.h" diff --git a/cpp/src/tests/MessageTest.cpp b/cpp/src/tests/MessageTest.cpp index 136c6f2d8d..dd6d66c3cd 100644 --- a/cpp/src/tests/MessageTest.cpp +++ b/cpp/src/tests/MessageTest.cpp @@ -21,7 +21,7 @@ #include "../broker/BrokerMessage.h" #include "qpid_test_plugin.h" #include <iostream> -#include "AMQP_HighestVersion.h" +#include "../gen/AMQP_HighestVersion.h" #include "../framing/AMQFrame.h" #include "MockChannel.h" diff --git a/cpp/src/tests/MockChannel.h b/cpp/src/tests/MockChannel.h index e47d591a9e..dfadb3a3cc 100644 --- a/cpp/src/tests/MockChannel.h +++ b/cpp/src/tests/MockChannel.h @@ -23,7 +23,7 @@ #include "../framing/ChannelAdapter.h" #include "../framing/OutputHandler.h" #include "../framing/AMQFrame.h" -#include "BasicGetBody.h" +#include "../gen/BasicGetBody.h" #include <boost/shared_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/cpp/src/tests/ProducerConsumerTest.cpp b/cpp/src/tests/ProducerConsumerTest.cpp index f2f3ab689a..0aa812e33e 100644 --- a/cpp/src/tests/ProducerConsumerTest.cpp +++ b/cpp/src/tests/ProducerConsumerTest.cpp @@ -27,7 +27,7 @@ #include "InProcessBroker.h" #include "../sys/ProducerConsumer.h" #include "../sys/Thread.h" -#include "AMQP_HighestVersion.h" +#include "../gen/AMQP_HighestVersion.h" #include "../sys/AtomicCount.h" using namespace qpid; diff --git a/cpp/src/tests/ReferenceTest.cpp b/cpp/src/tests/ReferenceTest.cpp index 223f750ef6..3f23d1072f 100644 --- a/cpp/src/tests/ReferenceTest.cpp +++ b/cpp/src/tests/ReferenceTest.cpp @@ -23,8 +23,8 @@ #include "qpid_test_plugin.h" #include "../broker/Reference.h" #include "../broker/BrokerMessageMessage.h" -#include "MessageTransferBody.h" -#include "MessageAppendBody.h" +#include "../gen/MessageTransferBody.h" +#include "../gen/MessageAppendBody.h" #include "../broker/CompletionHandler.h" using namespace boost; |