Author: aconway
Date: Fri Nov 9 11:59:54 2007
New Revision: 593638
URL: http://svn.apache.org/viewvc?rev=593638&view=rev
Log:
Package examples in rpm %doc directory.
Added:
incubator/qpid/trunk/qpid/cpp/examples/examples/
incubator/qpid/trunk/qpid/cpp/examples/examples/Makefile (with props)
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/ (props changed)
- copied from r593412, incubator/qpid/trunk/qpid/cpp/examples/direct/
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/Makefile
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/direct/Makefile
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/direct_config_queues.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/direct/direct_config_queues.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/direct_persistent_config_queues.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/direct/direct_persistent_config_queues.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/direct_persistent_publisher.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/direct/direct_persistent_publisher.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/direct_publisher.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/direct/direct_publisher.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/direct/listener.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/direct/listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/
- copied from r593412, incubator/qpid/trunk/qpid/cpp/examples/fanout/
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/Makefile
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/fanout/Makefile
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/fanout_config_queues.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_config_queues.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/fanout_consumer.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_consumer.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/fanout_publisher.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/fanout/fanout_publisher.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/listener.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/fanout/listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/
- copied from r593412, incubator/qpid/trunk/qpid/cpp/examples/pub-sub/
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/Makefile
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/topic_config_queues.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_config_queues.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/topic_listener.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/topic_publisher.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/topic_publisher.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/
- copied from r593412,
incubator/qpid/trunk/qpid/cpp/examples/request-response/
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/Makefile
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/request-response/Makefile
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/client.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/request-response/client.cpp
incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/server.cpp
- copied unchanged from r593636,
incubator/qpid/trunk/qpid/cpp/examples/request-response/server.cpp
Removed:
incubator/qpid/trunk/qpid/cpp/examples/create_queue.cpp
incubator/qpid/trunk/qpid/cpp/examples/direct/
incubator/qpid/trunk/qpid/cpp/examples/fanout/
incubator/qpid/trunk/qpid/cpp/examples/pub-sub/
incubator/qpid/trunk/qpid/cpp/examples/request-response/
Modified:
incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=593638&r1=593637&r2=593638&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Fri Nov 9 11:59:54 2007
@@ -1,18 +1,38 @@
-# Note: we don't use normal automake SUBDIRS because the example
-# makefiles are don't understand all automake targets.
-EXAMPLE_DIRS=direct fanout pub-sub request-response
-src=../$(top_srcdir)/src
-bld=../$(top_builddir)/src
+nobase_pkgdata_DATA= \
+ examples/Makefile \
+ examples/request-response/client.cpp \
+ examples/request-response/server.cpp \
+ examples/request-response/Makefile \
+ examples/fanout/Makefile \
+ examples/fanout/fanout_config_queues.cpp \
+ examples/fanout/listener.cpp \
+ examples/fanout/fanout_consumer.cpp \
+ examples/fanout/fanout_publisher.cpp \
+ examples/pub-sub/Makefile \
+ examples/pub-sub/topic_publisher.cpp \
+ examples/pub-sub/topic_config_queues.cpp \
+ examples/pub-sub/topic_listener.cpp \
+ examples/direct/Makefile \
+ examples/direct/direct_publisher.cpp \
+ examples/direct/direct_persistent_config_queues.cpp \
+ examples/direct/listener.cpp \
+ examples/direct/direct_config_queues.cpp \
+ examples/direct/direct_persistent_publisher.cpp
+
+EXTRA_DIST=$(nobase_pkgdata_DATA)
+
+# Note: we don't use normal automake SUBDIRS because the example
+# makefiles don't understand all the recursive automake targets.
+#
+src=../../$(top_srcdir)/src
+bld=../../$(top_builddir)/src
EXAMPLE_FLAGS=-I$(src) -I$(src)/gen -I$(bld)/gen -L$(bld)/.libs
all:
- for d in $(EXAMPLE_DIRS); do ( cd $$d; make CXX="$(CXX)"
CXXFLAGS="$(EXAMPLE_FLAGS)" $@; ) ; done
+ cd examples; $(MAKE) CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" all
clean:
- for d in $(EXAMPLE_DIRS); do ( cd $$d; make $@; ) ; done
-
-dist-hook: clean
- cp --parents `find $(EXAMPLE_DIRS) -name Makefile -o -name '*.cpp'`
$(distdir)
+ cd examples; $(MAKE) clean
Added: incubator/qpid/trunk/qpid/cpp/examples/examples/Makefile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/Makefile?rev=593638&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/Makefile (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/Makefile Fri Nov 9
11:59:54 2007
@@ -0,0 +1,6 @@
+SUBDIRS=direct fanout pub-sub request-response
+all:
+ for d in $(SUBDIRS); do ( cd $$d; $(MAKE) $@; ) ; done
+clean:
+ for d in $(SUBDIRS); do ( cd $$d; $(MAKE) $@; ) ; done
+
Propchange: incubator/qpid/trunk/qpid/cpp/examples/examples/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/examples/examples/direct/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 9 11:59:54 2007
@@ -0,0 +1,4 @@
+direct_config_queues
+direct_persistent_publisher
+direct_publisher
+listener
Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?rev=593638&r1=593637&r2=593638&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Fri Nov 9 11:59:54 2007
@@ -5,7 +5,7 @@
Name: @PACKAGE@
Version: @VERSION@
-Release: 8%{?dist}
+Release: 10%{?dist}
Summary: Libraries for Qpid C++ client applications
Group: System Environment/Libraries
License: Apache Software License
@@ -106,6 +106,7 @@
%_includedir/qpid/log
%_libdir/libqpidcommon.so
%_libdir/libqpidclient.so
+%doc %_datadir/%{name}/examples
%doc docs/api/html
%files -n %{qpidd}
@@ -149,8 +150,12 @@
/sbin/ldconfig
%changelog
+
+* Thu Nov 8 2007 Alan Conway <[EMAIL PROTECTED]> - 0.2-10
+- added examples to RPM package.
+
* Thu Oct 9 2007 Alan Conway <[EMAIL PROTECTED]> - 0.2-9
-- added %config(noreplace) for qpidd.conf
+- added config(noreplace) for qpidd.conf
* Thu Oct 4 2007 Alan Conway <[EMAIL PROTECTED]> - 0.2-8
- Added qpidd.conf configuration file.
Modified: incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel?rev=593638&r1=593637&r2=593638&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel (original)
+++ incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel Fri Nov 9 11:59:54
2007
@@ -1,11 +1,7 @@
This package provides header files needed to implement extensions to
-the Qpid broker daemon. It is not require for normal use of Qpid.
+the Qpid broker daemon. This feature is experimental and undocumented,
+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.
+See http://cwiki.apache.org/qpid/ for more information about the qpid project.
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=593638&r1=593637&r2=593638&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Fri Nov 9 11:59:54 2007
@@ -199,6 +199,7 @@
libqpidclient_la_LIBADD = libqpidcommon.la
libqpidclient_la_SOURCES = \
$(rgen_client_cpp) \
+ qpid/client/Session.h \
qpid/client/Connection.cpp \
qpid/client/Channel.cpp \
qpid/client/Exchange.cpp \
