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 2006/12/13 01:26:31 UTC
svn commit: r486428 - in /incubator/qpid/trunk/qpid/cpp: Makefile.am
README-dev README.txt configure.ac docs/api/Makefile.am
docs/api/user.doxygen lib/broker/Makefile.am lib/common/Makefile.am
qpidc.spec src/Makefile.am
Author: aconway
Date: Tue Dec 12 16:26:30 2006
New Revision: 486428
URL: http://svn.apache.org/viewvc?view=rev&rev=486428
Log:
Sundry fixes to spec and build system for RPM packaging.
Added:
incubator/qpid/trunk/qpid/cpp/README.txt
- copied, changed from r486205, incubator/qpid/trunk/qpid/cpp/README-dist
incubator/qpid/trunk/qpid/cpp/qpidc.spec
Modified:
incubator/qpid/trunk/qpid/cpp/Makefile.am
incubator/qpid/trunk/qpid/cpp/README-dev
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen
incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile.am?view=diff&rev=486428&r1=486427&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile.am Tue Dec 12 16:26:30 2006
@@ -1,7 +1,10 @@
AUTOMAKE_OPTIONS = 1.9.2 foreign
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = README-dist DESIGN LICENSE.txt NOTICE.txt README.rhel3
+EXTRA_DIST = README.txt README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3
+dist_doc_DATA = README.txt
+
+dist_sysconf_DATA = etc/init.d/qpidd
SUBDIRS = gen lib tests src docs/api docs/man
Modified: incubator/qpid/trunk/qpid/cpp/README-dev
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README-dev?view=diff&rev=486428&r1=486427&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README-dev (original)
+++ incubator/qpid/trunk/qpid/cpp/README-dev Tue Dec 12 16:26:30 2006
@@ -6,7 +6,8 @@
packages (or later) to build Qpid. We prefer to avoid spending time
accommodating older versions of these packages, so please make sure
that you have the latest stable version.
-
+
+ * GNU make <http://www.gnu.org/software/make/>
* autoconf <http://www.gnu.org/software/autoconf/>
* automake <http://www.gnu.org/software/automake/>
* cppunit <http://cppunit.sourceforge.net>
Copied: incubator/qpid/trunk/qpid/cpp/README.txt (from r486205, incubator/qpid/trunk/qpid/cpp/README-dist)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README.txt?view=diff&rev=486428&p1=incubator/qpid/trunk/qpid/cpp/README-dist&r1=486205&p2=incubator/qpid/trunk/qpid/cpp/README.txt&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README-dist (original)
+++ incubator/qpid/trunk/qpid/cpp/README.txt Tue Dec 12 16:26:30 2006
@@ -1,34 +1 @@
-
-This README describes how to build Qpid 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
-
-TODO: add boilerplate README for standard autoconf/automake install.
-TODO: document special qpid configure options.
- ./bootstrap
-
+TODO: Fill in this readme!
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=486428&r1=486427&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Tue Dec 12 16:26:30 2006
@@ -8,15 +8,13 @@
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-AC_INIT([qpid], [0.1], [qpid-dev@incubator.apache.org])
+AC_INIT([qpidc], [0.1], [qpid-dev@incubator.apache.org])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([dist-bzip2])
# Minimum Autoconf version required.
AC_PREREQ(2.59)
-# Where to generate output; srcdir location.
-# FIXME: if no one includes config.h, don't do this
AC_CONFIG_HEADERS([config.h:config.in])
AC_CONFIG_SRCDIR([lib/broker/ExchangeBinding.cpp])
Modified: incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am?view=diff&rev=486428&r1=486427&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am Tue Dec 12 16:26:30 2006
@@ -1,9 +1,9 @@
-html: user.doxygen doxygen.tstamp
+html: doxygen.tstamp
dist-hook: html
-EXTRA_DIST=html
+nobase_dist_doc_DATA=$(wildcard html/*)
SOURCES = \
$(wildcard $(topsrcdir)/gen/*.h) \
@@ -12,27 +12,11 @@
$(wildcard $(topsrcdir)/lib/common/framing/*.h) \
$(wildcard $(topsrcdir)/lib/client/*.h)
-doxygen.tstamp: $(SOURCES)
+doxygen.tstamp: user.doxygen $(SOURCES)
doxygen user.doxygen
touch $@
clean-local:
rm -rf docs.tstamp html man latex doxygen.tstamp xml
-HTML_TARGET_DIR=$(pkgdatadir)/api/html
-
-install-data-local:
- installfiles=`echo html/*`; \
- if test "$$installfiles" = 'html/*'; \
- then echo '-- Nothing to install' ; \
- else \
- $(mkinstalldirs) $(DESTDIR)$(HTML_TARGET_DIR); \
- for i in $$installfiles; do \
- echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(HTML_TARGET_DIR); \
- done; \
- fi
-
-uninstall-local:
- rm -f $(DESTDIR)$(HTML_TARGET_DIR)/*
Modified: incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen?view=diff&rev=486428&r1=486427&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen Tue Dec 12 16:26:30 2006
@@ -138,7 +138,7 @@
# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
-SHORT_NAMES = NO
+SHORT_NAMES = YES
# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
# will interpret the first line (until the first dot) of a JavaDoc-style
Modified: incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am?view=diff&rev=486428&r1=486427&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am Tue Dec 12 16:26:30 2006
@@ -79,3 +79,7 @@
TxOp.h \
TxPublish.cpp \
TxPublish.h
+
+
+# Force build during dist phase so help2man will work.
+dist-hook: $(lib_LTLIBRARIES)
Modified: incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am?view=diff&rev=486428&r1=486427&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am Tue Dec 12 16:26:30 2006
@@ -65,6 +65,7 @@
$(framing)/BodyHandler.cpp \
$(framing)/Buffer.cpp \
$(framing)/FieldTable.cpp \
+ $(framing)/FramingContent.cpp \
$(framing)/InitiationHandler.cpp \
$(framing)/ProtocolInitiation.cpp \
$(framing)/ProtocolVersion.cpp \
@@ -92,7 +93,6 @@
$(framing)/BodyHandler.h \
$(framing)/Buffer.h \
$(framing)/FieldTable.h \
- $(framing)/FramingContent.cpp \
$(framing)/FramingContent.h \
$(framing)/HeaderProperties.h \
$(framing)/InitiationHandler.h \
@@ -122,3 +122,7 @@
sys/Thread.h \
sys/Time.h \
sys/TimeoutHandler.h
+
+
+# Force build during dist phase so help2man will work.
+dist-hook: $(lib_LTLIBRARIES)
Added: incubator/qpid/trunk/qpid/cpp/qpidc.spec
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec?view=auto&rev=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec (added)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec Tue Dec 12 16:26:30 2006
@@ -0,0 +1,108 @@
+Name: qpidc
+Version: 0.1
+Release: 1%{?dist}
+Summary: Libraries for Qpid C++ client applications.
+Group: System Environment/Libraries
+License: Apache
+URL: http://incubator.apache.org/qpid/
+# FIXME: Source must be a URL pointing to where the tarball can be downloaded
+Source0: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# FIXME: The BR's need to be checked against a clean buildroot [lutter]
+BuildRequires: libtool
+BuildRequires: boost-devel
+BuildRequires: cppunit
+BuildRequires: cppunit-devel
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: help2man
+BuildRequires: pkgconfig
+
+# FIXME: Remove when APR dependency is removed. [aconway]
+BuildRequires: e2fsprogs-devel
+BuildRequires: apr-devel
+Requires: apr
+
+Requires: boost
+
+%description
+Run-time libraries for AMQP client applications developed using Qpid
+C++. Clients exchange messages with an AMQP message broker using
+the AMQP protocol.
+
+%package devel
+Summary: Header files and documentation for developing Qpid C++ clients.
+Group: Development/System
+Requires: %name-client = %version-%release
+Requires: libtool
+Requires: apr-devel
+Requires: boost-devel
+Requires: cppunit
+Requires: cppunit-devel
+
+%description devel
+Libraries, header files and documentation for developing AMQP clients
+in C++ using Qpid. Qpid implements the AMQP messaging specification.
+
+%define daemon qpidd
+%package -n %{daemon}
+Summary: An AMQP message broker daemon.
+Group: System Environment/Daemons
+Requires: %name-client = %version-%release
+
+%description %{daemon}
+A message broker daemon that receives stores and routes messages using
+the open AMQP messaging protocol.
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%_libdir/*.a
+rm -f $RPM_BUILD_ROOT%_libdir/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%check
+make check
+
+%files %{name}
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt
+%_docdir/html/*
+%_libdir/libqpidcommon.so.0
+%_libdir/libqpidcommon.so.0.1.0
+%_libdir/libqpidclient.so.0
+%_libdir/libqpidclient.so.0.1.0
+
+%files %{name}-devel
+%defattr(-,root,root,-)
+%_includedir/qpid/*.h
+%_libdir/libqpidcommon.so
+%_libdir/libqpidclient.so
+
+%files %{daemon}
+%_libdir/libqpidbroker.so.0
+%_libdir/libqpidbroker.so.0.1.0
+%_sbindir/%{daemon}
+%_mandir/man1/%{daemon}.*
+
+#FIXME: Fix Makefile.am to install etc/init.d/%{daemon} properly:
+%_sysconfdir/init.d/%{daemon}
+
+%changelog
+* Mon Dec 11 2006 Alan Conway <ac...@localhost.localdomain> - 0.1-1
+- Second cut, still needs work and testing.
+
+* Fri Dec 8 2006 David Lutterkort <dl...@redhat.com> - 0.1-1
+- Initial version based on Jim Meyering's sketch and discussions with Alan
+ Conway
+
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=486428&r1=486427&r2=486428
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Dec 12 16:26:30 2006
@@ -12,3 +12,6 @@
sbin_PROGRAMS = qpidd
qpidd_SOURCES = qpidd.cpp
+
+# Force build of qpidd during dist phase so help2man will work.
+dist-hook: $(sbin_PROGRAMS)