You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/15 10:01:17 UTC
svn commit: r446540 - in
/incubator/activemq/activemq-cpp/trunk/activemq-cpp: Makefile.am
activemq-cpp.pc.in autogen.sh configure.ac m4/ src/examples/Makefile.am
src/examples/main.cpp src/main/Makefile.am
Author: chirino
Date: Fri Sep 15 01:01:17 2006
New Revision: 446540
URL: http://svn.apache.org/viewvc?view=rev&rev=446540
Log:
Adding the start of an automake build system
Added:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am
incubator/activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in
incubator/activemq/activemq-cpp/trunk/activemq-cpp/autogen.sh (with props)
incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
incubator/activemq/activemq-cpp/trunk/activemq-cpp/m4/
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
Added: incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am?view=auto&rev=446540
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am (added)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am Fri Sep 15 01:01:17 2006
@@ -0,0 +1,15 @@
+# Since we don't strictly follow the GNU standard of having 'NEWS README AUTHORS ChangeLog' files
+AUTOMAKE_OPTIONS = foreign
+
+#Build in these directories:
+SUBDIRS = src/main src/examples
+
+#Distribute these directories:
+DIST_SUBDIRS = src/main src/examples
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = activemq-cpp.pc
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST=autogen.sh
Added: incubator/activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in?view=auto&rev=446540
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in (added)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/activemq-cpp.pc.in Fri Sep 15 01:01:17 2006
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ActiveMQ Client
+Description: ActiveMQ C++ library.
+Version: @VERSION@
+Libs: -L${libdir} -l@ACTIVEMQ_LIBRARY_NAME@-@ACTIVEMQ_API_VERSION@ -lpthread -ldl -luuid
+Cflags: -I${includedir}/@ACTIVEMQ_LIBRARY_NAME@-@ACTIVEMQ_API_VERSION@ -I${libdir}/@ACTIVEMQ_LIBRARY_NAME@-@ACTIVEMQ_API_VERSION@/include
Added: incubator/activemq/activemq-cpp/trunk/activemq-cpp/autogen.sh
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/autogen.sh?view=auto&rev=446540
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/autogen.sh (added)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/autogen.sh Fri Sep 15 01:01:17 2006
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoreconf --force --install -I config -I m4
Propchange: incubator/activemq/activemq-cpp/trunk/activemq-cpp/autogen.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?view=auto&rev=446540
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (added)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Fri Sep 15 01:01:17 2006
@@ -0,0 +1,66 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+# ---------------------------------------------------------------------------
+
+## --------------------------------
+## Initialization macros.
+## --------------------------------
+AC_INIT(activemq-cpp, 1, activemq-dev@geronimo.apache.org)
+AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_SRCDIR(src/main/activemq/core/ActiveMQConnection.cpp)
+
+## -----------------------------------------------
+## Define the Version variables
+## -----------------------------------------------
+ACTIVEMQ_LIBRARY_NAME=activemq-cpp
+ACTIVEMQ_VERSION=1.x-incubator-SNAPSHOT
+ACTIVEMQ_LIBRARY_VERSION=0:0:0
+ACTIVEMQ_RELEASE=0.0
+ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
+
+AC_SUBST(ACTIVEMQ_LIBRARY_NAME)
+AC_SUBST(ACTIVEMQ_VERSION)
+AC_SUBST(ACTIVEMQ_LIBRARY_VERSION)
+AC_SUBST(ACTIVEMQ_RELEASE)
+AC_SUBST(ACTIVEMQ_API_VERSION)
+
+PACKAGE=$ACTIVEMQ_LIBRARY_NAME
+VERSION=$ACTIVEMQ_VERSION
+
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+AM_CONFIG_HEADER(config.h)
+
+## -----------------------------------------------
+## Checks for programs.
+## -----------------------------------------------
+
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_LIBTOOL
+AM_SANITY_CHECK
+AC_LANG_CPLUSPLUS
+
+## -----------------------------------------------
+## Generates Makefile's, configuration files and scripts
+## -----------------------------------------------
+
+AC_OUTPUT(\
+ Makefile \
+ activemq-cpp.pc \
+ src/main/Makefile \
+ src/examples/Makefile \
+)
+
Added: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am?view=auto&rev=446540
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am (added)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am Fri Sep 15 01:01:17 2006
@@ -0,0 +1,12 @@
+cc_sources = main.cpp
+
+##
+## Compiler / Linker Info
+##
+
+INCLUDES = -I$(srcdir)/../main
+
+bin_PROGRAMS = example
+example_SOURCES = $(cc_sources)
+
+example_LDADD= ../main/libactivemq-cpp.la
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp?view=diff&rev=446540&r1=446539&r2=446540
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp Fri Sep 15 01:01:17 2006
@@ -27,6 +27,7 @@
#include <cms/ExceptionListener.h>
#include <cms/MessageListener.h>
#include <stdlib.h>
+#include <stdio.h>
using namespace activemq::core;
using namespace activemq::concurrent;
@@ -77,7 +78,7 @@
// Stringify the thread id
char threadIdStr[100];
- itoa( Thread::getId(), threadIdStr, 10 );
+ snprintf(threadIdStr, sizeof(threadIdStr), "%d", Thread::getId() );
// Create a messages
string text = (string)"Hello world! from thread " + threadIdStr;
@@ -239,7 +240,7 @@
}
};
-void main(int argc, char* argv[]) {
+int main(int argc, char* argv[]) {
HelloWorldProducer producer( 1000 );
HelloWorldConsumer consumer( 5000 );
@@ -255,6 +256,7 @@
// Wait for the threads to complete.
producerThread.join();
consumerThread.join();
+ return 0;
}
// END SNIPPET: demo
Added: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?view=auto&rev=446540
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (added)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Fri Sep 15 01:01:17 2006
@@ -0,0 +1,236 @@
+cc_sources = \
+ activemq/core/ActiveMQConsumer.cpp \
+ activemq/core/ActiveMQConnection.cpp \
+ activemq/core/ActiveMQSession.cpp \
+ activemq/core/ActiveMQConstants.cpp \
+ activemq/core/ActiveMQTransaction.cpp \
+ activemq/core/ActiveMQProducer.cpp \
+ activemq/core/ActiveMQConnectionFactory.cpp \
+ activemq/logger/LoggerHierarchy.cpp \
+ activemq/logger/LogWriter.cpp \
+ activemq/logger/Logger.cpp \
+ activemq/logger/LogManager.cpp \
+ activemq/logger/SimpleLogger.cpp \
+ activemq/support/InitDirector.cpp \
+ activemq/io/ByteArrayInputStream.cpp \
+ activemq/io/BufferedInputStream.cpp \
+ activemq/io/EndianWriter.cpp \
+ activemq/io/EndianReader.cpp \
+ activemq/io/BufferedOutputStream.cpp \
+ activemq/io/ByteArrayOutputStream.cpp \
+ activemq/concurrent/PooledThread.cpp \
+ activemq/concurrent/ThreadPool.cpp \
+ activemq/concurrent/Mutex.cpp \
+ activemq/concurrent/Thread.cpp \
+ activemq/exceptions/ActiveMQException.cpp \
+ activemq/connector/stomp/StompSessionManager.cpp \
+ activemq/connector/stomp/commands/CommandConstants.cpp \
+ activemq/connector/stomp/StompCommandReader.cpp \
+ activemq/connector/stomp/StompCommandWriter.cpp \
+ activemq/connector/stomp/StompConnectorFactory.cpp \
+ activemq/connector/stomp/marshal/Marshaler.cpp \
+ activemq/connector/stomp/StompConnector.cpp \
+ activemq/connector/ConnectorFactoryMap.cpp \
+ activemq/network/SocketInputStream.cpp \
+ activemq/network/ServerSocket.cpp \
+ activemq/network/TcpSocket.cpp \
+ activemq/network/BufferedSocket.cpp \
+ activemq/network/SocketOutputStream.cpp \
+ activemq/network/SocketFactory.cpp \
+ activemq/transport/IOTransportFactory.cpp \
+ activemq/transport/ResponseCorrelator.cpp \
+ activemq/transport/TcpTransport.cpp \
+ activemq/transport/IOTransport.cpp \
+ activemq/transport/TransportFactoryMap.cpp \
+ activemq/transport/TcpTransportFactory.cpp \
+ activemq/util/StringTokenizer.cpp \
+ activemq/util/Guid.cpp
+
+h_sources = \
+ activemq/core/ActiveMQSessionResource.h \
+ activemq/core/ActiveMQProducer.h \
+ activemq/core/ActiveMQMessage.h \
+ activemq/core/ActiveMQConnectionData.h \
+ activemq/core/ActiveMQDestination.h \
+ activemq/core/ActiveMQConnection.h \
+ activemq/core/ActiveMQTransaction.h \
+ activemq/core/ActiveMQMessageListener.h \
+ activemq/core/ActiveMQConnectionFactory.h \
+ activemq/core/ActiveMQConsumer.h \
+ activemq/core/ActiveMQSession.h \
+ activemq/core/ActiveMQAckHandler.h \
+ activemq/core/ActiveMQConstants.h \
+ activemq/logger/LoggerCommon.h \
+ activemq/logger/LogRecord.h \
+ activemq/logger/SimpleLogger.h \
+ activemq/logger/LoggerDefines.h \
+ activemq/logger/LoggerHierarchy.h \
+ activemq/logger/LogWriter.h \
+ activemq/logger/SimpleFormatter.h \
+ activemq/logger/Filter.h \
+ activemq/logger/Formatter.h \
+ activemq/logger/LogManager.h \
+ activemq/logger/Logger.h \
+ activemq/logger/StreamHandler.h \
+ activemq/logger/ConsoleHandler.h \
+ activemq/logger/PropertiesChangeListener.h \
+ activemq/logger/MarkBlockLogger.h \
+ activemq/logger/Handler.h \
+ activemq/support/LibraryInit.h \
+ activemq/support/InitDirector.h \
+ activemq/io/StandardErrorOutputStream.h \
+ activemq/io/ByteArrayInputStream.h \
+ activemq/io/InputStream.h \
+ activemq/io/EndianWriter.h \
+ activemq/io/BufferedOutputStream.h \
+ activemq/io/Reader.h \
+ activemq/io/BufferedInputStream.h \
+ activemq/io/EndianReader.h \
+ activemq/io/Writer.h \
+ activemq/io/ByteArrayOutputStream.h \
+ activemq/io/OutputStream.h \
+ activemq/io/IOException.h \
+ activemq/concurrent/Lock.h \
+ activemq/concurrent/ThreadPool.h \
+ activemq/concurrent/Thread.h \
+ activemq/concurrent/TaskListener.h \
+ activemq/concurrent/Synchronizable.h \
+ activemq/concurrent/Runnable.h \
+ activemq/concurrent/Mutex.h \
+ activemq/concurrent/PooledThread.h \
+ activemq/concurrent/Concurrent.h \
+ activemq/concurrent/PooledThreadListener.h \
+ activemq/exceptions/InvalidStateException.h \
+ activemq/exceptions/RuntimeException.h \
+ activemq/exceptions/InterruptedException.h \
+ activemq/exceptions/ActiveMQException.h \
+ activemq/exceptions/IllegalMonitorStateException.h \
+ activemq/exceptions/ExceptionDefines.h \
+ activemq/exceptions/NoSuchElementException.h \
+ activemq/exceptions/UnsupportedOperationException.h \
+ activemq/exceptions/NullPointerException.h \
+ activemq/exceptions/IllegalArgumentException.h \
+ activemq/connector/ConsumerMessageListener.h \
+ activemq/connector/ConnectorException.h \
+ activemq/connector/TransactionInfo.h \
+ activemq/connector/SessionInfo.h \
+ activemq/connector/ConnectorResource.h \
+ activemq/connector/ConnectorFactory.h \
+ activemq/connector/stomp/StompSessionInfo.h \
+ activemq/connector/stomp/StompTransactionInfo.h \
+ activemq/connector/stomp/StompSessionManager.h \
+ activemq/connector/stomp/StompQueue.h \
+ activemq/connector/stomp/StompConnectorFactory.h \
+ activemq/connector/stomp/StompFrame.h \
+ activemq/connector/stomp/commands/DisconnectCommand.h \
+ activemq/connector/stomp/commands/AbortCommand.h \
+ activemq/connector/stomp/commands/ErrorCommand.h \
+ activemq/connector/stomp/commands/CommandConstants.h \
+ activemq/connector/stomp/commands/UnsubscribeCommand.h \
+ activemq/connector/stomp/commands/AbstractCommand.h \
+ activemq/connector/stomp/commands/StompMessage.h \
+ activemq/connector/stomp/commands/AckCommand.h \
+ activemq/connector/stomp/commands/StompCommand.h \
+ activemq/connector/stomp/commands/BytesMessageCommand.h \
+ activemq/connector/stomp/commands/ReceiptCommand.h \
+ activemq/connector/stomp/commands/SubscribeCommand.h \
+ activemq/connector/stomp/commands/BeginCommand.h \
+ activemq/connector/stomp/commands/TextMessageCommand.h \
+ activemq/connector/stomp/commands/ConnectCommand.h \
+ activemq/connector/stomp/commands/ConnectedCommand.h \
+ activemq/connector/stomp/commands/MessageCommand.h \
+ activemq/connector/stomp/commands/CommitCommand.h \
+ activemq/connector/stomp/StompCommandListener.h \
+ activemq/connector/stomp/marshal/Marshalable.h \
+ activemq/connector/stomp/marshal/MarshalException.h \
+ activemq/connector/stomp/marshal/Marshaler.h \
+ activemq/connector/stomp/StompCommandReader.h \
+ activemq/connector/stomp/StompCommandWriter.h \
+ activemq/connector/stomp/StompConnectorException.h \
+ activemq/connector/stomp/StompProducerInfo.h \
+ activemq/connector/stomp/StompSelector.h \
+ activemq/connector/stomp/StompConsumerInfo.h \
+ activemq/connector/stomp/StompConnector.h \
+ activemq/connector/stomp/StompDestination.h \
+ activemq/connector/stomp/StompTopic.h \
+ activemq/connector/ConnectorFactoryMap.h \
+ activemq/connector/Connector.h \
+ activemq/connector/ConnectorFactoryMapRegistrar.h \
+ activemq/connector/ProducerInfo.h \
+ activemq/connector/ConsumerInfo.h \
+ activemq/network/SocketException.h \
+ activemq/network/TcpSocket.h \
+ activemq/network/ServerSocket.h \
+ activemq/network/Socket.h \
+ activemq/network/SocketInputStream.h \
+ activemq/network/BufferedSocket.h \
+ activemq/network/SocketOutputStream.h \
+ activemq/network/SocketFactory.h \
+ activemq/transport/IOTransportFactory.h \
+ activemq/transport/Transport.h \
+ activemq/transport/TransportFactory.h \
+ activemq/transport/CommandListener.h \
+ activemq/transport/ExceptionResponse.h \
+ activemq/transport/ResponseCorrelator.h \
+ activemq/transport/IOTransport.h \
+ activemq/transport/TcpTransport.h \
+ activemq/transport/TransportExceptionListener.h \
+ activemq/transport/BrokerError.h \
+ activemq/transport/CommandReader.h \
+ activemq/transport/TcpTransportFactory.h \
+ activemq/transport/Command.h \
+ activemq/transport/CommandWriter.h \
+ activemq/transport/TransportFactoryMapRegistrar.h \
+ activemq/transport/TransportFactoryMap.h \
+ activemq/transport/FutureResponse.h \
+ activemq/transport/Response.h \
+ activemq/transport/CommandIOException.h \
+ activemq/transport/TransportFilter.h \
+ activemq/util/Endian.h \
+ activemq/util/Number.h \
+ activemq/util/Integer.h \
+ activemq/util/Guid.h \
+ activemq/util/Properties.h \
+ activemq/util/Long.h \
+ activemq/util/SimpleProperties.h \
+ activemq/util/Boolean.h \
+ activemq/util/StringTokenizer.h \
+ activemq/util/Queue.h \
+ cms/DeliveryMode.h \
+ cms/TemporaryQueue.h \
+ cms/MapMessage.h \
+ cms/Destination.h \
+ cms/Connection.h \
+ cms/TemporaryTopic.h \
+ cms/Stoppable.h \
+ cms/Topic.h \
+ cms/BytesMessage.h \
+ cms/CMSException.h \
+ cms/Session.h \
+ cms/Startable.h \
+ cms/Closeable.h \
+ cms/MessageListener.h \
+ cms/TextMessage.h \
+ cms/ExceptionListener.h \
+ cms/Queue.h \
+ cms/ConnectionFactory.h \
+ cms/MessageProducer.h \
+ cms/Message.h \
+ cms/MessageConsumer.h
+
+##
+## Compiler / Linker Info
+##
+
+INCLUDES = -I$(srcdir)
+lib_LTLIBRARIES= libactivemq-cpp.la
+libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources)
+libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION) -release $(ACTIVEMQ_VERSION)
+libactivemq_cpp_la_LIBADD=-lpthread -ldl -luuid
+
+
+##
+## Packaging Info
+##
+library_includedir=$(includedir)/$(ACTIVEMQ_LIBRARY_NAME)-$(ACTIVEMQ_VERSION)
+nobase_library_include_HEADERS = $(h_sources)