You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2011/11/07 21:56:54 UTC
svn commit: r1198929 - in /qpid/trunk/qpid/cpp: bindings/qmf/
bindings/qmf/python/ bindings/qmf/ruby/ bindings/qmf2/
bindings/qmf2/python/ bindings/qmf2/ruby/ docs/man/ src/ src/tests/
Author: astitcher
Date: Mon Nov 7 20:56:53 2011
New Revision: 1198929
URL: http://svn.apache.org/viewvc?rev=1198929&view=rev
Log:
QPID-3586: Changes for QPID-3464 break cmake build in tar.gz distribution
- Added in the new CMake files to EXTRA_DIST in the Makefile.am files so
that they get built into the tarballs
- Added some cluster test files back into the .../tests/cluster.mk file
as they seem to have been dropped by mistake (and having them missing
also breaks the cmake build in a similar way)
Modified:
qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf2/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am
qpid/trunk/qpid/cpp/docs/man/Makefile.am
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/tests/cluster.mk
Modified: qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am Mon Nov 7 20:56:53 2011
@@ -19,7 +19,7 @@
if HAVE_SWIG
-EXTRA_DIST = qmfengine.i
+EXTRA_DIST = CMakeLists.txt qmfengine.i
SUBDIRS = tests
if HAVE_RUBY_DEVEL
Modified: qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am Mon Nov 7 20:56:53 2011
@@ -25,7 +25,7 @@ generated_file_list = \
qmfengine.cpp \
qmfengine.py
-EXTRA_DIST = python.i
+EXTRA_DIST = CMakeLists.txt python.i
BUILT_SOURCES = $(generated_file_list)
SWIG_FLAGS = -w362,401
Modified: qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am Mon Nov 7 20:56:53 2011
@@ -21,7 +21,7 @@ if HAVE_RUBY_DEVEL
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
-EXTRA_DIST = ruby.i
+EXTRA_DIST = CMakeLists.txt ruby.i
BUILT_SOURCES = qmfengine.cpp
SWIG_FLAGS = -w362,401
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/Makefile.am?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/Makefile.am Mon Nov 7 20:56:53 2011
@@ -19,7 +19,7 @@
if HAVE_SWIG
-EXTRA_DIST = qmf2.i
+EXTRA_DIST = CMakeLists.txt qmf2.i
SUBDIRS = examples/cpp
if HAVE_RUBY_DEVEL
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am Mon Nov 7 20:56:53 2011
@@ -25,7 +25,7 @@ generated_file_list = \
cqmf2.cpp \
cqmf2.py
-EXTRA_DIST = python.i
+EXTRA_DIST = CMakeLists.txt python.i
BUILT_SOURCES = $(generated_file_list)
SWIG_FLAGS = -w362,401
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am Mon Nov 7 20:56:53 2011
@@ -21,7 +21,7 @@ if HAVE_RUBY_DEVEL
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
-EXTRA_DIST = ruby.i
+EXTRA_DIST = CMakeLists.txt ruby.i
BUILT_SOURCES = cqmf2.cpp
SWIG_FLAGS = -w362,401
Modified: qpid/trunk/qpid/cpp/docs/man/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/docs/man/Makefile.am?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/docs/man/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/docs/man/Makefile.am Mon Nov 7 20:56:53 2011
@@ -38,7 +38,7 @@
dist_man_MANS = qpidd.1
man_aux = $(dist_man_MANS:.1=.x)
-EXTRA_DIST = $(man_aux) generate_manpage groffify_options.sed groffify_template.sed
+EXTRA_DIST = $(man_aux) CMakeLists.txt generate_manpage groffify_options.sed groffify_template.sed
DISTCLEANFILES = $(dist_man_MANS)
CLEANFILES=qpidd.1
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Mon Nov 7 20:56:53 2011
@@ -288,6 +288,7 @@ EXTRA_DIST +=\
ssl.cmake \
managementgen.cmake \
rubygen.cmake \
+ versions.cmake \
$(rgen_amqp_0_10_srcs) \
qpid/amqp_0_10/apply.h \
qpid/amqp_0_10/built_in_types.h \
Modified: qpid/trunk/qpid/cpp/src/tests/cluster.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster.mk?rev=1198929&r1=1198928&r2=1198929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster.mk (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster.mk Mon Nov 7 20:56:53 2011
@@ -83,14 +83,16 @@ LONG_TESTS += \
qpidtest_PROGRAMS += cluster_test
cluster_test_SOURCES = \
- cluster_test.cpp \
- unit_test.cpp \
- ClusterFixture.cpp \
- ClusterFixture.h \
- ForkedBroker.h \
- ForkedBroker.cpp \
- PartialFailure.cpp \
- ClusterFailover.cpp
+ cluster_test.cpp \
+ unit_test.cpp \
+ ClusterFixture.cpp \
+ ClusterFixture.h \
+ ForkedBroker.h \
+ ForkedBroker.cpp \
+ PartialFailure.cpp \
+ ClusterFailover.cpp \
+ InitialStatusMap.cpp \
+ StoreStatus.cpp
cluster_test_LDADD=$(lib_client) $(lib_broker) ../cluster.la -lboost_unit_test_framework
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org