You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/01/14 19:48:48 UTC
svn commit: r496114 - in /incubator/qpid/branches/qpid.0-9/cpp: Makefile.am
README README-dist README.txt lib/broker/SessionHandlerImpl.cpp qpidc.spec
rpm/ rpm/Makefile.am
Author: aconway
Date: Sun Jan 14 10:48:47 2007
New Revision: 496114
URL: http://svn.apache.org/viewvc?view=rev&rev=496114
Log:
* Combined README.txt and READE-dist into README. Fixes cwiki link,
and provides more useful chunk of info.
* Fixed rpm target to create build directories.
Added:
incubator/qpid/branches/qpid.0-9/cpp/README
- copied, changed from r496109, incubator/qpid/branches/qpid.0-9/cpp/README.txt
Removed:
incubator/qpid/branches/qpid.0-9/cpp/README-dist
incubator/qpid/branches/qpid.0-9/cpp/README.txt
Modified:
incubator/qpid/branches/qpid.0-9/cpp/Makefile.am
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp
incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec
incubator/qpid/branches/qpid.0-9/cpp/rpm/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am
Modified: incubator/qpid/branches/qpid.0-9/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/Makefile.am?view=diff&rev=496114&r1=496113&r2=496114
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/Makefile.am Sun Jan 14 10:48:47 2007
@@ -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
Copied: incubator/qpid/branches/qpid.0-9/cpp/README (from r496109, incubator/qpid/branches/qpid.0-9/cpp/README.txt)
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/README?view=diff&rev=496114&p1=incubator/qpid/branches/qpid.0-9/cpp/README.txt&r1=496109&p2=incubator/qpid/branches/qpid.0-9/cpp/README&r2=496114
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/README.txt (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/README Sun Jan 14 10:48:47 2007
@@ -1,4 +1,3 @@
-
Qpid C++ is a C++ implementation of the AMQP protcol described at
http://amqp.org/
@@ -12,4 +11,34 @@
For additional software or information on the Qpid project go to:
http://incubator.apache.org/qpid/index.html
+
+
+= Building from a source distribution =
+
+== Prerequisites ==
+
+ * Apache Portable Runtime 1.2.2: http://apr.apache.org
+ * boost 1.33.1: http://www.boost.org
+
+Optional: if you want to run the qpid unit tests:
+ * CppUnit 1.11.4: http://cppunit.sourceforge.net
+ Note: Ensure cppunit-config is in your PATH.
+
+If you use yum to install packages you can do:
+
+ # yum install apr apr-devel boost boost-devel cppunit cppunit-devel
+
+== Building ==
+
+If you install boost to a non-standard location then you'll need define CXXFLAGS prior
+to doing ./configure:
+
+ export CXXFLAGS=-I${boost_prefix}/include/boost-1_33_1
+
+e.g. export CXXFLAGS=-I$HOME/local/boost-1.33.1/include/boost-1_33_1
+
+Build and install with:
+ # ./configure
+ # make all
+ # make install
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp?view=diff&rev=496114&r1=496113&r2=496114
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/broker/SessionHandlerImpl.cpp Sun Jan 14 10:48:47 2007
@@ -224,6 +224,7 @@
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 */);
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec?view=diff&rev=496114&r1=496113&r2=496114
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec Sun Jan 14 10:48:47 2007
@@ -87,7 +87,7 @@
%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
Propchange: incubator/qpid/branches/qpid.0-9/cpp/rpm/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jan 14 10:48:47 2007
@@ -1,2 +1,7 @@
Makefile.in
Makefile
+BUILD
+RPMS
+SOURCES
+SPECS
+SRPMS
Modified: incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am?view=diff&rev=496114&r1=496113&r2=496114
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am Sun Jan 14 10:48:47 2007
@@ -10,16 +10,22 @@
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
+