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 2010/03/17 17:33:50 UTC
svn commit: r924359 - in /qpid/trunk/qpid: QPID_VERSION.txt cpp/.gitignore
cpp/Makefile.am cpp/bld-winsdk.ps1 cpp/bootstrap cpp/configure.ac
cpp/examples/README.txt cpp/src/qpid/Version.h cpp/src/qpid/Version.h.in
Author: aconway
Date: Wed Mar 17 16:33:50 2010
New Revision: 924359
URL: http://svn.apache.org/viewvc?rev=924359&view=rev
Log:
C++ automake build picks up version number from qpid/QPID_VERSION.txt.
Added:
qpid/trunk/qpid/QPID_VERSION.txt
qpid/trunk/qpid/cpp/.gitignore
qpid/trunk/qpid/cpp/src/qpid/Version.h.in
- copied, changed from r924317, qpid/trunk/qpid/cpp/src/qpid/Version.h
Removed:
qpid/trunk/qpid/cpp/src/qpid/Version.h
Modified:
qpid/trunk/qpid/cpp/Makefile.am
qpid/trunk/qpid/cpp/bld-winsdk.ps1
qpid/trunk/qpid/cpp/bootstrap
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/examples/README.txt
Added: qpid/trunk/qpid/QPID_VERSION.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/QPID_VERSION.txt?rev=924359&view=auto
==============================================================================
--- qpid/trunk/qpid/QPID_VERSION.txt (added)
+++ qpid/trunk/qpid/QPID_VERSION.txt Wed Mar 17 16:33:50 2010
@@ -0,0 +1 @@
+0.7
Added: qpid/trunk/qpid/cpp/.gitignore
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/.gitignore?rev=924359&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/.gitignore (added)
+++ qpid/trunk/qpid/cpp/.gitignore Wed Mar 17 16:33:50 2010
@@ -0,0 +1 @@
+/QPID_VERSION.txt
Modified: qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/Makefile.am?rev=924359&r1=924358&r2=924359&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/Makefile.am Wed Mar 17 16:33:50 2010
@@ -25,7 +25,7 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
LICENSE NOTICE README SSL RELEASE_NOTES DESIGN \
xml/cluster.xml INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake \
- packaging/NSIS
+ packaging/NSIS QPID_VERSION.txt
SUBDIRS = managementgen etc src docs/api docs/man examples bindings/qmf
Modified: qpid/trunk/qpid/cpp/bld-winsdk.ps1
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bld-winsdk.ps1?rev=924359&r1=924358&r2=924359&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bld-winsdk.ps1 (original)
+++ qpid/trunk/qpid/cpp/bld-winsdk.ps1 Wed Mar 17 16:33:50 2010
@@ -24,7 +24,7 @@ foreach ($arg in $args) {"Arg: $arg"}
$qpid_cpp_src='..\qpid\cpp'
$install_dir='install_dir'
-$ver='0.6'
+$ver='0.7'
$zipfile="qpid-cpp-$ver.zip"
# Clean out install directory
Modified: qpid/trunk/qpid/cpp/bootstrap
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bootstrap?rev=924359&r1=924358&r2=924359&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bootstrap (original)
+++ qpid/trunk/qpid/cpp/bootstrap Wed Mar 17 16:33:50 2010
@@ -1,5 +1,8 @@
#!/bin/sh
-set -e
+
+# Copy the global QPID_VERSION.txt file into the source tree.
+cp ../QPID_VERSION.txt .
+
aclocal -I m4
autoheader
libtoolize --automake
@@ -15,10 +18,10 @@ cat > src/managementgen.mk <<EOF
\$(mgen_cmd)
EOF
-
automake
autoconf
+# Optionally do the build as well.
if [ "$1" = "-build" -o "$1" = "--build" ] ; then
shift
./configure "$@"
Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=924359&r1=924358&r2=924359&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Wed Mar 17 16:33:50 2010
@@ -11,7 +11,12 @@ dnl
dnl When updating the name/version number here, also update it in
dnl src/qpid/Version.h
-AC_INIT([qpidc], [0.7], [dev@qpid.apache.org])
+# Pick up the version from QPID_VERSION.txt in the qpid/cpp source tree.
+# NB. You need to re-run bootstrap if the global qpid/QPID_VERSION.txt changes.
+AC_INIT([qpidc],
+ [m4_esyscmd([cat QPID_VERSION.txt | tr -d '\n'])],
+ [dev@qpid.apache.org])
+
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
@@ -233,7 +238,7 @@ fi
AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test -f $PYTHON_INC/Python.h && test -n "$SWIG"])
-specdir=`pwd`/$srcdir/../specs
+specdir=`pwd`/$top_srcdir/../specs
AMQP_FINAL_XML=$specdir/amqp.0-10-qpid-errata.xml
AC_SUBST(AMQP_FINAL_XML)
AM_CONDITIONAL([GENERATE], [test -f $AMQP_FINAL_XML])
@@ -532,6 +537,7 @@ AC_CONFIG_FILES([
managementgen/Makefile
etc/Makefile
src/Makefile
+ src/qpid/Version.h
src/tests/Makefile
src/tests/test_env.sh
docs/man/Makefile
Modified: qpid/trunk/qpid/cpp/examples/README.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/README.txt?rev=924359&r1=924358&r2=924359&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/README.txt (original)
+++ qpid/trunk/qpid/cpp/examples/README.txt Wed Mar 17 16:33:50 2010
@@ -16,12 +16,12 @@ On Linux:
# ./declare_queues host1 9999
On Windows:
- C:\Program Files\qpidc-0.6\examples\direct> declare_queues host1 9999
+ C:\Program Files\qpidc-0.7\examples\direct> declare_queues host1 9999
The qpid C++ broker executable is named qpidd on Linux and qpidd.exe
on Windows. The default install locations are:
- Linux: /usr/sbin
-- Windows: C:\Program Files\qpidc-0.6\bin
+- Windows: C:\Program Files\qpidc-0.7\bin
In a C++ source distribution the broker is located in the src subdirectory
(generally, from this examples directory, ../src).
@@ -52,9 +52,9 @@ On Linux:
# ./listener
On Windows:
- C:\Program Files\qpidc-0.6\examples\direct> declare_queues
- C:\Program Files\qpidc-0.6\examples\direct> direct_producer
- C:\Program Files\qpidc-0.6\examples\direct> listener
+ C:\Program Files\qpidc-0.7\examples\direct> declare_queues
+ C:\Program Files\qpidc-0.7\examples\direct> direct_producer
+ C:\Program Files\qpidc-0.7\examples\direct> listener
Note that there is no requirement for the listener to be running before the
messages are published. The messages are stored in the queue until consumed
@@ -86,9 +86,9 @@ On Linux:
# ./fanout_producer
On Windows:
- C:\Program Files\qpidc-0.6\examples\fanout> listener
+ C:\Program Files\qpidc-0.7\examples\fanout> listener
- C:\Program Files\qpidc-0.6\examples\direct> fanout_producer
+ C:\Program Files\qpidc-0.7\examples\direct> fanout_producer
== Publisher/Subscriber ==
@@ -122,9 +122,9 @@ On Linux:
# ./topic_publisher
On Windows:
- C:\Program Files\qpidc-0.6\examples\pub-sub> topic_listener
+ C:\Program Files\qpidc-0.7\examples\pub-sub> topic_listener
- C:\Program Files\qpidc-0.6\examples\pub-sub> topic_publisher
+ C:\Program Files\qpidc-0.7\examples\pub-sub> topic_publisher
== Request/Response ==
@@ -147,8 +147,8 @@ On Linux:
# ./client
On Windows:
- C:\Program Files\qpidc-0.6\examples\request-response> server
- C:\Program Files\qpidc-0.6\examples\request-response> client
+ C:\Program Files\qpidc-0.7\examples\request-response> server
+ C:\Program Files\qpidc-0.7\examples\request-response> client
== QMF Agent ==
Copied: qpid/trunk/qpid/cpp/src/qpid/Version.h.in (from r924317, qpid/trunk/qpid/cpp/src/qpid/Version.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Version.h.in?p2=qpid/trunk/qpid/cpp/src/qpid/Version.h.in&p1=qpid/trunk/qpid/cpp/src/qpid/Version.h&r1=924317&r2=924359&rev=924359&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Version.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Version.h.in Wed Mar 17 16:33:50 2010
@@ -36,7 +36,7 @@ namespace qpid {
# endif
#else
const std::string product = "qpidc";
- const std::string version = "0.7";
+ const std::string version = "@VERSION@";
const std::string saslName = "qpid-broker";
#endif
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org