activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r554623 - in /activemq/activemq-cpp/tags/activemq-cpp-2.1: Makefile.am README.txt configure.ac
Date Mon, 09 Jul 2007 12:50:21 GMT
Author: tabish
Date: Mon Jul  9 05:50:20 2007
New Revision: 554623

URL: http://svn.apache.org/viewvc?view=rev&rev=554623
Log:
preparing for 2.1

Modified:
    activemq/activemq-cpp/tags/activemq-cpp-2.1/Makefile.am
    activemq/activemq-cpp/tags/activemq-cpp-2.1/README.txt
    activemq/activemq-cpp/tags/activemq-cpp-2.1/configure.ac

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1/Makefile.am?view=diff&rev=554623&r1=554622&r2=554623
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1/Makefile.am (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1/Makefile.am Mon Jul  9 05:50:20 2007
@@ -20,7 +20,7 @@
 
 SUBDIRS = src/main src/examples
 if BUILD_CPPUNIT_TESTS
-  SUBDIRS += src/test src/test-integration src/test-benchmarks
+  SUBDIRS += src/test src/test-integration
 endif
 
 #Distribute these directories:

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1/README.txt
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1/README.txt?view=diff&rev=554623&r1=554622&r2=554623
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1/README.txt (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1/README.txt Mon Jul  9 05:50:20 2007
@@ -12,14 +12,14 @@
 1.1 libuuid
 --------------------------------------------------------------------------
 
-The build requires the *libuuid* library that is part of the e2fsprogs 
-package and is available from http://e2fsprogs.sourceforge.net/ which is 
+The build requires the *libuuid* library that is part of the e2fsprogs
+package and is available from http://e2fsprogs.sourceforge.net/ which is
 not always installed by default.
 
 On Fedora, type the following:
 
   sudo yum install e2fsprogs-devel
-  
+
 On Debian/Ubuntu, type the following:
 
   sudo apt-get install uuid-dev
@@ -28,32 +28,32 @@
 1.2 CppUnit
 --------------------------------------------------------------------------
 
-The package contains a complete set of CppUnit tests.  In order for you to 
-build an run the tests, you will need to download and install the CppUnit 
+The package contains a complete set of CppUnit tests.  In order for you to
+build an run the tests, you will need to download and install the CppUnit
 suite.  See http://cppunit.sourceforge.net/cppunit-wiki
 
 On Fedora, type the following:
 
-  sudo yum install cppunit
-  
+  sudo yum install cppunit cppunit-devel
+
 On Debian/Ubuntu, type the following:
 
   sudo apt-get install libcppunit-dev
 
-Make sure that the paths to the installed CppUnit library and includes are 
+Make sure that the paths to the installed CppUnit library and includes are
 visible in your current shell before you try building the tests.
 
-Windows users will need to build the CppUnit library using the CPPUnit 
-MSVC project files. A discussion of the build process can be found 
-on the CPPUnit wiki under 
-http://cppunit.sourceforge.net/cppunit-wiki/BuildingCppUnit1 this covers 
+Windows users will need to build the CppUnit library using the CPPUnit
+MSVC project files. A discussion of the build process can be found
+on the CPPUnit wiki under
+http://cppunit.sourceforge.net/cppunit-wiki/BuildingCppUnit1 this covers
 both MSVC along with many other platforms and tool suites.
 
 
 1.3 GNU Build System (for building on Unix/Linux/OS X/Cygwin)
 --------------------------------------------------------------------------
 
-To Generate the ./configure script use to create the Makefiles, you need 
+To Generate the ./configure script use to create the Makefiles, you need
 the following software installed:
 
 Tool        Recommended Version
@@ -70,7 +70,7 @@
 2 Building on Unix/Linux/OS X/Cygwin
 --------------------------------------------------------------------------
 
-This assumes you have all of the project dependencies installed.  We're 
+This assumes you have all of the project dependencies installed.  We're
 now ready to create the configure script.  To do this, run:
 
   ./autogen.sh
@@ -78,7 +78,7 @@
     -----------------------------------------------------------------------
     |NOTE: You may see the following warnings when running this command:  |
     |                                                                     |
-    |  src/test-integration/Makefile.am:44: `CXXFLAGS' is a user variable,| 
+    |  src/test-integration/Makefile.am:44: `CXXFLAGS' is a user variable,|
     |you should not override it;                                          |
     |  src/test-integration/Makefile.am:44: use `AM_CXXFLAGS' instead.    |
     |  src/test/Makefile.am:104: `CXXFLAGS' is a user variable, you       |
@@ -90,17 +90,17 @@
     |warnings.                                                            |
     -----------------------------------------------------------------------
 
-This should be run the first time and anytime you change configure.ac or 
+This should be run the first time and anytime you change configure.ac or
 any of the Makefile.am files.
 
     -----------------------------------------------------------------------
-    |Solaris 10 Note:  CppUnit might not build until you correct the file | 
+    |Solaris 10 Note:  CppUnit might not build until you correct the file |
     |  libstdc++.la to contain the correct data, see this discussion:     |
     |  http://forum.sun.com/jive/thread.jspa?threadID=73150               |
     -----------------------------------------------------------------------
-    
-The configure script will customize the way the software is built and 
-installed into your system along with detecting the available libraries 
+
+The configure script will customize the way the software is built and
+installed into your system along with detecting the available libraries
 that have been installed.  To use the default configuration just run:
 
   ./configure
@@ -109,17 +109,17 @@
 
   ./configure --help
 
-Once the configure script has run successfully, you are ready to build. 
+Once the configure script has run successfully, you are ready to build.
 Run:
 
   make
-  
-This will build all of the core ActiveMQ CPP source code.  To build and 
+
+This will build all of the core ActiveMQ CPP source code.  To build and
 install the code into the system directories, run:
 
   make install
 
-You will have to become the superuser in order to be able to install the 
+You will have to become the superuser in order to be able to install the
 files.
 
 3 Doxygen
@@ -139,18 +139,18 @@
 
   make check
 
-This will verify that the library is functioning correctly on the target 
+This will verify that the library is functioning correctly on the target
 platform. In addition, it will generate the integration tests binary.
 
 4.2 Integration Tests
 --------------------------------------------------------------------------
-The library also contains a set of tests that are run against a real AMQ 
-broker.  These allow you to validate this distribution of ActiveMQ CPP 
-against your broker.  Running these without a broker will result in failed 
-tests.  The tests currently hard-code the broker url to be 
+The library also contains a set of tests that are run against a real AMQ
+broker.  These allow you to validate this distribution of ActiveMQ CPP
+against your broker.  Running these without a broker will result in failed
+tests.  The tests currently hard-code the broker url to be
 tcp://localhost:61613 for stomp and tcp://localhost:61616 for openwire.
 
-The integration tests are built via "make check".  To run them, first 
+The integration tests are built via "make check".  To run them, first
 start a broker and then
 
   cd src/test-integration
@@ -160,38 +160,38 @@
 
 5 Example
 --------------------------------------------------------------------------
-There is an example application that ships with the distribution in 
-src/examples.   The example is compiled by default with the "make" 
+There is an example application that ships with the distribution in
+src/examples.   The example is compiled by default with the "make"
 command, but can easily be compiled manually using the command:
 
   g++ -o main -pthread -I ../main main.cpp ../../out/libactivemq-cpp-2_0.a -luuid
 
 6 Notes for Windows users
 --------------------------------------------------------------------------
-We support using the GNU compiler on Windows, using the Cygwin package.  
+We support using the GNU compiler on Windows, using the Cygwin package.
 However we also support using the MSVC compiler on Windows.
 
-There are a couple or things that you will need to setup to ensure that 
+There are a couple or things that you will need to setup to ensure that
 the MSVC compile succeeds.
 
-* You need to download and install the Platform SDK if you don't have it 
+* You need to download and install the Platform SDK if you don't have it
   installed already.
-  
-* Ensure that the path to you MSVC install is set in the PATH env variable.   
-  You can test this by typing cl.exe at the command line, if you get an 
+
+* Ensure that the path to you MSVC install is set in the PATH env variable.
+  You can test this by typing cl.exe at the command line, if you get an
   error complaining that its not found, then you'll need to fix your PATH.
-* Set the INCLUDE env variable to include the path to your MSVC includes, 
+* Set the INCLUDE env variable to include the path to your MSVC includes,
   and the platform SDK includes. For example:
 
     INCLUDE = D:\Program Files\Microsoft Visual Studio 8\VC\include;D:\Program Files\Microsoft
Platform SDK\Include\*
 
-* Set the LIB env variable to include the path to your MSVC libs, and the 
+* Set the LIB env variable to include the path to your MSVC libs, and the
   Platform SDK libs. For example:
 
     LIB = D:\Program Files\Microsoft Visual Studio 8\VC\lib;D:\Program Files\Microsoft Platform
SDK\Lib
 
-* The Project files reference the CPPUnit libraries for the Integration and 
-  Unit tests builds. In order for these to build correctly you must 
-  either place the CPPUnit libraries in a directory listed in the project 
+* The Project files reference the CPPUnit libraries for the Integration and
+  Unit tests builds. In order for these to build correctly you must
+  either place the CPPUnit libraries in a directory listed in the project
   settings, or add a new location for your install of CPPUnit.
 

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1/configure.ac?view=diff&rev=554623&r1=554622&r2=554623
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1/configure.ac (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1/configure.ac Mon Jul  9 05:50:20 2007
@@ -26,8 +26,8 @@
 ## Define the Version variables
 ## -----------------------------------------------
 ACTIVEMQ_LIBRARY_NAME=activemq-cpp
-ACTIVEMQ_VERSION=2.1-SNAPSHOT
-ACTIVEMQ_LIBRARY_VERSION=0:0:0
+ACTIVEMQ_VERSION=2.1
+ACTIVEMQ_LIBRARY_VERSION=2:1:0
 ACTIVEMQ_RELEASE=0.0
 ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
 
@@ -168,7 +168,6 @@
 then
   AC_CONFIG_FILES(src/test/Makefile)
   AC_CONFIG_FILES(src/test-integration/Makefile)
-  AC_CONFIG_FILES(src/test-benchmarks/Makefile)
 fi
 
 AC_OUTPUT



Mime
View raw message