From 0e72fcd72e163c32e84e62f999b007b74b64f086 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 17 Mar 2010 16:33:50 +0000 Subject: 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 --- cpp/.gitignore | 1 + cpp/Makefile.am | 2 +- cpp/bld-winsdk.ps1 | 2 +- cpp/bootstrap | 7 +++++-- cpp/configure.ac | 10 ++++++++-- cpp/examples/README.txt | 22 +++++++++++----------- cpp/src/qpid/Version.h | 44 -------------------------------------------- cpp/src/qpid/Version.h.in | 44 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 71 insertions(+), 61 deletions(-) create mode 100644 cpp/.gitignore delete mode 100755 cpp/src/qpid/Version.h create mode 100755 cpp/src/qpid/Version.h.in (limited to 'cpp') 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 < 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 deleted file mode 100755 index c8add11112..0000000000 --- a/cpp/src/qpid/Version.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef QPID_VERSION_H -#define QPID_VERSION_H - -/* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -namespace qpid { -#ifdef HAVE_CONFIG_H - const std::string product = PACKAGE_NAME; - const std::string version = PACKAGE_VERSION; -# if HAVE_SASL - const std::string saslName = BROKER_SASL_NAME; -# else - const std::string saslName = "qpidd-no-sasl"; -# endif -#else - const std::string product = "qpidc"; - const std::string version = "0.7"; - const std::string saslName = "qpid-broker"; -#endif -} - -#endif /*!QPID_VERSION_H*/ diff --git a/cpp/src/qpid/Version.h.in b/cpp/src/qpid/Version.h.in new file mode 100755 index 0000000000..b85935a756 --- /dev/null +++ b/cpp/src/qpid/Version.h.in @@ -0,0 +1,44 @@ +#ifndef QPID_VERSION_H +#define QPID_VERSION_H + +/* + * + * Copyright (c) 2006 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +namespace qpid { +#ifdef HAVE_CONFIG_H + const std::string product = PACKAGE_NAME; + const std::string version = PACKAGE_VERSION; +# if HAVE_SASL + const std::string saslName = BROKER_SASL_NAME; +# else + const std::string saslName = "qpidd-no-sasl"; +# endif +#else + const std::string product = "qpidc"; + const std::string version = "@VERSION@"; + const std::string saslName = "qpid-broker"; +#endif +} + +#endif /*!QPID_VERSION_H*/ -- cgit v1.2.1