Author: kpvdr Date: 2008-09-11 12:12:08 -0400 (Thu, 11 Sep 2008) New Revision: 2441 Removed: store/trunk/cpp/mrg-grid.spec store/trunk/cpp/mrg-messaging.spec store/trunk/cpp/mrg.spec store/trunk/cpp/rhm.spec.in Modified: store/trunk/cpp/ store/trunk/cpp/configure.ac store/trunk/cpp/lib/Makefile.am store/trunk/cpp/tests/Makefile.am store/trunk/cpp/tests/jrnl/Makefile.am store/trunk/cpp/tests/jrnl/jtt/Makefile.am Log: changed lib name from libbdbstore.so to msgstore.so, changed libtool options to match qpid (thanks, andrew stitcher) Property changes on: store/trunk/cpp ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in aclocal.m4 autom4te.cache config.h config.in config.log config.status configure libtool stamp-h1 rpm rhm.spec rhm-0.2.tar.gz rhm-0.2.tar.bz2 rhm-0.2 rhm-0.1.tar.gz + Makefile Makefile.in aclocal.m4 autom4te.cache config.h config.in config.log config.status configure libtool stamp-h1 Modified: store/trunk/cpp/configure.ac =================================================================== --- store/trunk/cpp/configure.ac 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/configure.ac 2008-09-11 16:12:08 UTC (rev 2441) @@ -184,7 +184,6 @@ AM_CONDITIONAL([DOXYGEN], [test x$do_doxygen = xyes]) AC_CONFIG_FILES([ - rhm.spec Makefile tests/Makefile tests/jrnl/Makefile Modified: store/trunk/cpp/lib/Makefile.am =================================================================== --- store/trunk/cpp/lib/Makefile.am 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/lib/Makefile.am 2008-09-11 16:12:08 UTC (rev 2441) @@ -1,20 +1,22 @@ AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) $(QPID_CXXFLAGS) -I$(srcdir)/gen \ -DRHM_CLEAN -pthread + +# Definitions for client and daemon plugins +PLUGINLDFLAGS=-no-undefined -module -avoid-version +dmoduledir=$(libdir)/qpid/daemon +dmodule_LTLIBRARIES = msgstore.la -lib_LTLIBRARIES = libbdbstore.la - -libbdbstore_la_LIBADD = \ +msgstore_la_LIBADD = \ $(APR_LIBS) \ $(LIB_DLOPEN) \ $(LIB_BERKELEY_DB) \ $(LIB_CLOCK_GETTIME) \ $(QPID_LIBS) -libbdbstore_la_LDFLAGS = \ - -version-info \ - $(LIBTOOL_VERSION_INFO_ARG) +msgstore_la_LDFLAGS = \ + $(PLUGINLDFLAGS) -libbdbstore_la_SOURCES = \ +msgstore_la_SOURCES = \ StorePlugin.cpp \ BindingDbt.cpp \ BufferValue.cpp \ Deleted: store/trunk/cpp/mrg-grid.spec =================================================================== --- store/trunk/cpp/mrg-grid.spec 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/mrg-grid.spec 2008-09-11 16:12:08 UTC (rev 2441) @@ -1,37 +0,0 @@ -Summary: MRG - Grid component -Name: mrg-grid -Version: 1.0 -Release: 4%{?dist} -License: LGPL -Group: System Environment/Libraries -URL: http://redhat.com/mrg -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch - -Requires: condor -Requires: mrg-grid-docs - -%description -This is the top-level package that includes the MRG Grid component. - -%install -rm -rf %{buildroot} - -%clean -rm -rf $RPM_BUILD_ROOT - -%prep - -%build - -%files -%defattr(-,root,root,-) - - -%changelog -* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com&gt; - 1.0-4 -- Bumped for Beta 3 update - -* Wed Nov 28 2007 Nuno Santos <nsantos(a)redhat.com&gt; - 1.0-1 -- Initial build. - Deleted: store/trunk/cpp/mrg-messaging.spec =================================================================== --- store/trunk/cpp/mrg-messaging.spec 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/mrg-messaging.spec 2008-09-11 16:12:08 UTC (rev 2441) @@ -1,48 +0,0 @@ -Summary: MRG - Messaging component -Name: mrg-messaging -Version: 1.0 -Release: 5%{?dist} -License: LGPL -Group: System Environment/Libraries -URL: http://redhat.com/mrg -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch - -Requires: rhm -Requires: rhm-docs -Requires: qpidc-devel -Requires: python-qpid -Requires: qpid-java-client - - -%description -This is the top-level package that includes the MRG Grid component. - -%install -rm -rf %{buildroot} - -%clean -rm -rf $RPM_BUILD_ROOT - -%prep - -%build - -%files -%defattr(-,root,root,-) - - -%changelog -* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com&gt; - 1.0-5 -- Bumped for Beta 3 update - -* Wed Jan 23 2008 Nuno Santos <nsantos(a)redhat.com&gt; - 1.0-4 -- Added dependencies for -devel packages, so that examples work - as per the tutorial - -* Mon Jan 21 2008 Gordon Sim <gsim(a)redhat.com&gt; - 1.0-2 -- Bumped release - -* Wed Nov 28 2007 Nuno Santos <nsantos(a)redhat.com&gt; - 1.0-1 -- Initial build. - Deleted: store/trunk/cpp/mrg.spec =================================================================== --- store/trunk/cpp/mrg.spec 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/mrg.spec 2008-09-11 16:12:08 UTC (rev 2441) @@ -1,39 +0,0 @@ -Summary: MRG - Messaging, Real-Time, and Grid components -Name: mrg -Version: 1.0 -Release: 4%{?dist} -License: LGPL -Group: System Environment/Libraries -URL: http://redhat.com/mrg -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch - -Requires: mrg-messaging -Requires: mrg-realtime -Requires: mrg-grid - -%description -This is the top-level package that includes all the MRG components: Messaging, -Reat-Time, and Grid. - -%install -rm -rf %{buildroot} - -%clean -rm -rf $RPM_BUILD_ROOT - -%prep - -%build - -%files -%defattr(-,root,root,-) - - -%changelog -* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com&gt; - 1.0-4 -- Bumped for Beta 3 update - -* Wed Nov 28 2007 Nuno Santos <nsantos(a)redhat.com&gt; - 1.0-1 -- Initial build. - Deleted: store/trunk/cpp/rhm.spec.in =================================================================== --- store/trunk/cpp/rhm.spec.in 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/rhm.spec.in 2008-09-11 16:12:08 UTC (rev 2441) @@ -1,124 +0,0 @@ -# -# Spec file for Red Hat Messaging package rhm. -# - -%define svnrev xxx -# built against qpidc svn rev xxx - -Name: rhm -Version: @VERSION@ -Release: 21%{?dist} -Summary: Red Hat extensions to the Qpid messaging system -Group: System Environment/Libraries -License: LGPL -URL: http://rhm.et.redhat.com/rhm -Source0: http://rhm.et.redhat.com/download/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -ExclusiveArch: i386 x86_64 - -BuildRequires: qpidc-devel -BuildRequires: qpidd-devel -BuildRequires: db4-devel -# TODO: Workaround missing dependency in qpidd-devel. Remove this -# when qpid-devel is updated. -BuildRequires: e2fsprogs-devel -BuildRequires: libaio-devel -BuildRequires: python -BuildRequires: libtool - -Requires: qpidd -Requires: db4 -Requires: libaio - -%description -Red Hat extensions to the Qpid AMQP broker: persistent message storage -in Berkeley DB. - -%prep -%setup -q - -%build -%configure --disable-static --disable-rpath CXXFLAGS="-O3 -DNDEBUG" -make %{?_smp_mflags} - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -install -d -m0775 %{buildroot}%{_localstatedir}/rhm -install -d -m0755 %{buildroot}/usr/lib/qpidd -install -Dp -m0755 lib/.libs/libbdbstore.so* %{buildroot}/usr/lib/qpidd -rm -f %{buildroot}%_libdir/*.a -rm -f %{buildroot}%_libdir/*.la -rm -f %{buildroot}%_libdir/*.so* -rm %{buildroot}%_sysconfdir/rhmd.conf - -%clean -rm -rf %{buildroot} - -%check -make check - -%files -%defattr(-,root,root,-) -%doc README COPYING -/usr/lib/qpidd/libbdbstore.so* -%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm - - -%changelog -* Thu May 29 2008 Nuno Santos <nsantos(a)nsantos.bos.redhat.com&gt; - 0.2-21 -- BZ448931: remove initscript for rhmd, and shell startup script - -* Mon Apr 14 2008 Kim van der Riet <kim.vdriet(a)redhat.com&gt; - 0.2-20 -- removed cppunit as build dependency - all tests now boost test - -* Fri Apr 11 2008 Kim van der Riet <kim.vdriet(a)redhat.com&gt; - 0.2-19 -- added python package as build dependency - -* Tue Feb 12 2008 Rafael Schloming <rafaels(a)redhat.com&gt; - 0.2-17 -- bump release for Beta 3 bug fixes - -* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com&gt; - 0.2-15 -- Bumped for Beta 3 update - -* Tue Jan 22 2008 Nuno Santos <nsantos(a)redhat.com&gt; - 0.2-14 -- fix syntax in configuration file - -* Thu Jan 21 2008 Gordon Sim <gsim(a)redhat.com&gt; - 0.2-13 -- Bump release for various journal fixes. - -* Thu Jan 03 2008 Nuno Santos <nsantos(a)redhat.com&gt; - 0.2-11 -- add missing dependencies on libaio, cppunit, qpidc-devel - -* Thu Jan 03 2008 Nuno Santos <nsantos(a)redhat.com&gt; - 0.2-6 -- limit builds to i386 and x86_64 archs - -* Tue Dec 18 2007 Nuno Santos <nsantos(a)redhat.com&gt; - 0.2-5 -- Include several fixes, mainly from Kim Van Der Riet (BZ 401071: Add journal - file geometry parameters to broker, 401091: Handle journal full condition in - broker, 401151: Journal RID not monotonically increasing in all cases, - 401191: Journal recovery fails when overwrite boundary coincides with - previous record, 403051: Failures in perftest fanout mode with async - persistence, 403201: Messages prematurely deleted by store, 413021: Journal - recovery fails when flush did not occur and records don't end on sblk - boundary, 423981: Error running durable perftest) - -* Thu Dec 06 2007 Alan Conway <aconway(a)redhat.com&gt; - 0.2-4 -- Build with optimized flags. - -* Thu Oct 04 2007 Nuno Santos <nsantos(a)redhat.com&gt; - 0.2-2 -- Add rhmd init script - -* Wed Jul 25 2007 Nuno Santos <nsantos(a)redhat.com&gt; - 0.2-1 -- Disable rpath; bump release to match numbers of qpidc trunk packages - -* Tue Apr 17 2007 Alan Conway <aconway(a)redhat.com&gt; - 0.1-3 -- Workaround missing BuildRequires: e2fsprogs-devel in qpidc-devel. - -* Tue Apr 17 2007 Alan Conway <aconway(a)redhat.com&gt; - 0.1-2 -- Added missing BuildRequires: db4-devel - -* Thu Apr 12 2007 Alan Conway <aconway(a)redhat.com&gt; - 0.1-1 -- Initial build. - Modified: store/trunk/cpp/tests/Makefile.am =================================================================== --- store/trunk/cpp/tests/Makefile.am 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/tests/Makefile.am 2008-09-11 16:12:08 UTC (rev 2441) @@ -25,7 +25,7 @@ TwoPhaseCommitTest UNIT_TEST_SRCS = unit_test.cpp unit_test.h -UNIT_TEST_LDADD = -lboost_unit_test_framework $(top_builddir)/lib/libbdbstore.la +UNIT_TEST_LDADD = -lboost_unit_test_framework $(top_builddir)/lib/msgstore.la include gen.mk @@ -59,6 +59,6 @@ QPID_DIR=$(QPID_DIR) \ VALGRIND=$(VALGRIND) \ abs_srcdir=$(abs_srcdir) \ - LIBBDBSTORE=$(abs_builddir)/../lib/.libs/libbdbstore.so \ + LIBBDBSTORE=$(abs_builddir)/../lib/.libs/msgstore.so \ TMPDIR=$(TMPDIR) \ $(srcdir)/run_test Modified: store/trunk/cpp/tests/jrnl/Makefile.am =================================================================== --- store/trunk/cpp/tests/jrnl/Makefile.am 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/tests/jrnl/Makefile.am 2008-09-11 16:12:08 UTC (rev 2441) @@ -74,7 +74,7 @@ _st_read_txn UNIT_TEST_SRCS = ../unit_test.cpp -UNIT_TEST_LDADD = -lboost_unit_test_framework ${top_builddir}/lib/libbdbstore.la +UNIT_TEST_LDADD = -lboost_unit_test_framework ${top_builddir}/lib/msgstore.la _ut_time_ns_SOURCES = _ut_time_ns.cpp $(UNIT_TEST_SRCS) _ut_time_ns_LDADD = $(UNIT_TEST_LDADD) Modified: store/trunk/cpp/tests/jrnl/jtt/Makefile.am =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/Makefile.am 2008-09-10 20:29:50 UTC (rev 2440) +++ store/trunk/cpp/tests/jrnl/jtt/Makefile.am 2008-09-11 16:12:08 UTC (rev 2441) @@ -26,7 +26,7 @@ TMPDIR=$(abs_srcdir)/test_tmp -LINK_BDB = ${top_builddir}/lib/libbdbstore.la +LINK_BDB = ${top_builddir}/lib/msgstore.la TESTS_ENVIRONMENT = \ VALGRIND=$(VALGRIND) \