diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/README (renamed from cpp/README-dist) | 20 | ||||
| -rw-r--r-- | cpp/README.txt | 15 | ||||
| -rw-r--r-- | cpp/lib/broker/SessionHandlerImpl.cpp | 1 | ||||
| -rw-r--r-- | cpp/qpidc.spec | 2 | ||||
| -rw-r--r-- | cpp/rpm/Makefile.am | 12 |
6 files changed, 27 insertions, 25 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 41321af5e9..2867b8727c 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = 1.9.2 foreign ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3 README.txt etc/qpidd +EXTRA_DIST = README README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3 etc/qpidd SUBDIRS = gen lib src docs/api docs/man rpm tests diff --git a/cpp/README-dist b/cpp/README index 1474ba9aa6..a64cff1074 100644 --- a/cpp/README-dist +++ b/cpp/README @@ -1,5 +1,19 @@ +Qpid C++ is a C++ implementation of the AMQP protcol described at +http://amqp.org/ -This README describes how to build Qpid from a source distribution. +For instructions on using the Qpid broker daemon see man qpidd(1) + +For information on the C++ client API see ./html/index.html + +Note the daemon and client API can be installed separately. + +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 + + += Building from a source distribution = == Prerequisites == @@ -28,7 +42,3 @@ Build and install with: # make all # make install -TODO: add boilerplate README for standard autoconf/automake install. -TODO: document special qpid configure options. - ./bootstrap - diff --git a/cpp/README.txt b/cpp/README.txt deleted file mode 100644 index 4703d7538e..0000000000 --- a/cpp/README.txt +++ /dev/null @@ -1,15 +0,0 @@ - -Qpid C++ is a C++ implementation of the AMQP protcol described at -http://amqp.org/ - -For instructions on using the Qpid broker daemon see man qpidd(1) - -For information on the C++ client API see ./html/index.html - -Note the daemon and client API can be installed separately. - -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 - diff --git a/cpp/lib/broker/SessionHandlerImpl.cpp b/cpp/lib/broker/SessionHandlerImpl.cpp index 7a44d9f872..f34ef59922 100644 --- a/cpp/lib/broker/SessionHandlerImpl.cpp +++ b/cpp/lib/broker/SessionHandlerImpl.cpp @@ -224,6 +224,7 @@ void SessionHandlerImpl::ChannelHandlerImpl::open(u_int16_t channel, const strin parent->framemax, parent->queues->getStore(), parent->settings.stagingThreshold); + // FIXME aconway 2007-01-04: provide valid channel Id as per ampq 0-9 parent->client->getChannel().openOk(channel, std::string()/* ID */); } diff --git a/cpp/qpidc.spec b/cpp/qpidc.spec index b9be94f62e..d6f71c939a 100644 --- a/cpp/qpidc.spec +++ b/cpp/qpidc.spec @@ -87,7 +87,7 @@ make check %files %defattr(-,root,root,-) -%doc LICENSE.txt NOTICE.txt README.txt +%doc LICENSE.txt NOTICE.txt README %_libdir/libqpidcommon.so.0 %_libdir/libqpidcommon.so.0.1.0 %_libdir/libqpidclient.so.0 diff --git a/cpp/rpm/Makefile.am b/cpp/rpm/Makefile.am index 46c071ec87..887b3112c6 100644 --- a/cpp/rpm/Makefile.am +++ b/cpp/rpm/Makefile.am @@ -10,16 +10,22 @@ RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir clean: rm -rf BUILD RPMS SOURCES SPECS SRPMS -.PHONY: rpm srpm dist +.PHONY: rpm srpm dist dirs # Build source and binary RPMs. -rpm: dist +rpm: dist dirs rpmbuild $(RPMOPTS) -ba $(SPEC) # Source RPM only. -srpm: dist +srpm: dist dirs rpmbuild $(RPMOPTS) -bs $(SPEC) # Build source distribution. dist: cd .. && $(MAKE) $(AM_MAKEFLAGS) dist + +# Create build directories. +dirs: BUILD RPMS SOURCES SPECS SRPMS +BUILD RPMS SOURCES SPECS SRPMS: + $(MKDIR_P) BUILD RPMS SOURCES SPECS SRPMS + |