C++ automake build picks up version number from qpid/QPID_VERSION.txt.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@924359 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 29 insertions, 18 deletions

diff --git a/QPID_VERSION.txt b/QPID_VERSION.txt
new file mode 100644
index 0000000000..eb49d7c7fd
--- /dev/null
+++ b/QPID_VERSION.txt
@@ -0,0 +1 @@
+0.7
diff --git a/cpp/.gitignore b/cpp/.gitignore
new file mode 100644
index 0000000000..4e945f96db
--- /dev/null
+++ b/cpp/.gitignore
@@ -0,0 +1 @@
+/QPID_VERSION.txt
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index dcbc4c10c3..5c475946a0 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -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
 
diff --git a/cpp/bld-winsdk.ps1 b/cpp/bld-winsdk.ps1
index cc83dfc35d..7660927819 100644
--- a/cpp/bld-winsdk.ps1
+++ b/cpp/bld-winsdk.ps1
@@ -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

diff --git a/cpp/bootstrap b/cpp/bootstrap
index 5f33fec63f..925344acf7 100755
--- a/cpp/bootstrap
+++ b/cpp/bootstrap
@@ -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 "$@"
diff --git a/cpp/configure.ac b/cpp/configure.ac
index 1ac3f3397e..997f859aec 100644
--- a/cpp/configure.ac
+++ b/cpp/configure.ac
@@ -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
diff --git a/cpp/examples/README.txt b/cpp/examples/README.txt
index 0663286664..bfad478c63 100644
--- a/cpp/examples/README.txt
+++ b/cpp/examples/README.txt
@@ -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 ==

 

diff --git a/cpp/src/qpid/Version.h b/cpp/src/qpid/Version.h.in
index c8add11112..b85935a756 100755
--- a/cpp/src/qpid/Version.h
+++ b/cpp/src/qpid/Version.h.in
@@ -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
 }