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/30 06:18:18 UTC
svn commit: r451537 - in
/incubator/activemq/activemq-cpp/trunk/activemq-cpp: ./
src/main/activemq/network/ src/main/activemq/util/
Author: chirino
Date: Fri Sep 29 21:18:15 2006
New Revision: 451537
URL: http://svn.apache.org/viewvc?view=rev&rev=451537
Log:
Got activemq and the example to build and run. Also tidied up some header #define handling
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln
incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj
incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq.vcproj
Modified: 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=diff&rev=451537&r1=451536&r2=451537
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Fri Sep 29 21:18:15 2006
@@ -58,6 +58,12 @@
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
+AC_CHECK_HEADERS([uuid.h])
+AC_CHECK_HEADERS([uuid/uuid.h])
+AC_CHECK_HEADERS([objbase.h])
+AC_CHECK_HEADERS([repcdce.h])
+##AC_CHECK_HEADERS([Winsock2.h])
+
#save_LIBS="${LIBS}"
#AC_CHECK_LIB(rt, clock_gettime, [rt_libs=" -lrt"])
#LIBS="${LIBS}${rt_libs}"
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp?view=diff&rev=451537&r1=451536&r2=451537
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp Fri Sep 29 21:18:15 2006
@@ -14,9 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <activemq/util/Config.h>
-#if (defined(unix) || defined(__APPLE__)) && !defined(__CYGWIN__)
- #include <unistd.h>
+#if defined(HAVE_WINSOCK2_H)
+ #include <Winsock2.h>
+ #include <Ws2tcpip.h>
+ #include <sys/stat.h>
+ #define stat _stat
+#else
+ #include <unistd.h>
#include <netdb.h>
#include <fcntl.h>
#include <sys/file.h>
@@ -25,11 +31,6 @@
#include <arpa/inet.h>
#include <string.h>
extern int errno;
-#else
- #include <Winsock2.h>
- #include <Ws2tcpip.h>
- #include <sys/stat.h>
- #define stat _stat
#endif
#include <stdio.h>
@@ -38,6 +39,7 @@
#include <ctype.h>
#include <errno.h>
#include <sys/types.h>
+
#include "TcpSocket.h"
#include "SocketInputStream.h"
#include "SocketOutputStream.h"
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h?view=diff&rev=451537&r1=451536&r2=451537
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h Fri Sep 29 21:18:15 2006
@@ -1,31 +1,51 @@
-/*
- * 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.
- */
-#ifndef ACTIVEMQ_UTIL_CONFIG_H_
-#define ACTIVEMQ_UTIL_CONFIG_H_
-
-//
-// The purpose of this header is to try to detect the supported headers
-// of the platform when the ./configure script is not being used to generate
-// the config.h file.
-//
-
-#if !( defined( unix ) || defined(__APPLE__) ) || defined( __CYGWIN__ )
-#define HAVE_WINSOCK2_H
-#endif
-
-
-#endif /*ACTIVEMQ_UTIL_CONFIG_H_*/
+/*
+ * 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.
+ */
+#ifndef ACTIVEMQ_UTIL_CONFIG_H_
+#define ACTIVEMQ_UTIL_CONFIG_H_
+
+//
+// The purpose of this header is to try to detect the supported headers
+// of the platform when the ./configure script is not being used to generate
+// the config.h file.
+//
+#if defined(HAVE_CONFIG_H)
+
+ // config.h is generated by the ./configure script and it only
+ // used by unix like systems (includeing cygwin)
+ #include <config.h>
+
+
+#else /* !defined(HAVE_CONFIG_H) */
+
+ // Not using ./configure script and make system.. chances are your using the native build tools
+ // of Windows or OS X to do this build
+ #if defined(__APPLE__)
+ #define HAVE_UUID_H
+ #elif defined(_WIN32) || defined( __CYGWIN__ )
+ #define HAVE_OBJBASE_H
+ #define HAVE_RPCDCE_H
+ #define HAVE_WINSOCK2_H
+ #elif defined( unix )
+ #define HAVE_UUID_UUID_H
+ #else
+ #error "Unknown Platform"
+ #endif
+
+#endif /* !defined(HAVE_CONFIG_H) */
+
+
+#endif /*ACTIVEMQ_UTIL_CONFIG_H_*/
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h?view=diff&rev=451537&r1=451536&r2=451537
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h Fri Sep 29 21:18:15 2006
@@ -17,17 +17,22 @@
#ifndef ACTIVEMQ_UTIL_GUID_H
#define ACTIVEMQ_UTIL_GUID_H
-#if defined( unix ) || defined(__APPLE__) && !defined( __CYGWIN__ )
+#include <activemq/exceptions/RuntimeException.h>
+#include <activemq/exceptions/IllegalArgumentException.h>
+#include <activemq/util/Config.h>
+
+#if defined(HAVE_UUID_UUID_H)
#include <uuid/uuid.h>
-#elif defined(_WIN32) || defined( __CYGWIN__ )
+#endif
+#if defined(HAVE_UUID_H)
+ #include "uuid.h"
+#endif
+#if defined(HAVE_OBJBASE_H)
#include <objbase.h>
+#endif
+#if defined(HAVE_RPCDCE_H)
#include <rpcdce.h>
-#else // defined MACOSX
- #include "uuid.h"
#endif
-
-#include <activemq/exceptions/RuntimeException.h>
-#include <activemq/exceptions/IllegalArgumentException.h>
#include <string>
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln?view=diff&rev=451537&r1=451536&r2=451537
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-cpp.sln Fri Sep 29 21:18:15 2006
@@ -1,11 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2005-activemq-test", "vs2005-cms.vcproj", "{10ACADC6-66E6-4B3E-8A6A-611486588107}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2005-activemq", "vs2005-activemq.vcproj", "{60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2005-activemq-example", "vs2005-activemq-example.vcproj", "{23EFE0EC-D277-4AC0-9DDC-0E0C588B54B8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26} = {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,10 +14,6 @@
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {10ACADC6-66E6-4B3E-8A6A-611486588107}.Debug|Win32.ActiveCfg = Debug|Win32
- {10ACADC6-66E6-4B3E-8A6A-611486588107}.Debug|Win32.Build.0 = Debug|Win32
- {10ACADC6-66E6-4B3E-8A6A-611486588107}.Release|Win32.ActiveCfg = Release|Win32
- {10ACADC6-66E6-4B3E-8A6A-611486588107}.Release|Win32.Build.0 = Release|Win32
{60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}.Debug|Win32.ActiveCfg = Debug|Win32
{60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}.Debug|Win32.Build.0 = Debug|Win32
{60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}.Release|Win32.ActiveCfg = Release|Win32
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj?view=diff&rev=451537&r1=451536&r2=451537
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq-example.vcproj Fri Sep 29 21:18:15 2006
@@ -41,15 +41,13 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""C:\sandbox\activemq-cpp-trunk\activemq-cpp\src\main""
- PreprocessorDefinitions="WIN32 NDEBUG _LIB WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
- WarningLevel="3"
+ WarningLevel="2"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
- DisableSpecificWarnings="4290"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -62,9 +60,11 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="$(OutDir)\activemq.lib ws2_32.lib rpcrt4.lib"
+ OutputFile="$(OutDir)\activemq-example.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
- SubSystem="2"
+ SubSystem="1"
TargetMachine="1"
/>
<Tool
@@ -118,13 +118,11 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""C:\sandbox\activemq-cpp-trunk\activemq-cpp\src\main""
- PreprocessorDefinitions="WIN32 NDEBUG _LIB WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
UsePrecompiledHeader="0"
- WarningLevel="3"
+ WarningLevel="2"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- DisableSpecificWarnings="4290"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -137,9 +135,11 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="$(OutDir)\activemq.lib"
+ OutputFile="$(OutDir)\activemq-example.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
- SubSystem="2"
+ SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq.vcproj
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq.vcproj?view=diff&rev=451537&r1=451536&r2=451537
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq.vcproj (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-activemq.vcproj Fri Sep 29 21:18:15 2006
@@ -19,7 +19,7 @@
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
+ ConfigurationType="4"
CharacterSet="1"
>
<Tool
@@ -40,14 +40,14 @@
<Tool
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
- Optimization="2"
+ Optimization="0"
AdditionalIncludeDirectories=""C:\sandbox\activemq-cpp-trunk\activemq-cpp\src\main""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)"
KeepComments="false"
MinimalRebuild="false"
ExceptionHandling="1"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="2"
Detect64BitPortabilityProblems="true"
@@ -63,19 +63,13 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\activemq.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -85,12 +79,6 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -98,7 +86,7 @@
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
+ ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -119,14 +107,14 @@
/>
<Tool
Name="VCCLCompilerTool"
+ UseUnicodeResponseFiles="false"
AdditionalIncludeDirectories=""C:\sandbox\activemq-cpp-trunk\activemq-cpp\src\main""
- PreprocessorDefinitions="WIN32 NDEBUG _LIB WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)"
+ RuntimeLibrary="0"
UsePrecompiledHeader="0"
- WarningLevel="3"
+ WarningLevel="2"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- DisableSpecificWarnings="4290"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -138,21 +126,13 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\activemq.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -162,12 +142,6 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -519,6 +493,10 @@
>
</File>
<File
+ RelativePath=".\src\main\activemq\util\Config.h"
+ >
+ </File>
+ <File
RelativePath=".\src\main\activemq\connector\stomp\commands\ConnectCommand.h"
>
</File>
@@ -791,11 +769,11 @@
>
</File>
<File
- RelativePath=".\src\main\cms\Queue.h"
+ RelativePath=".\src\main\activemq\util\Queue.h"
>
</File>
<File
- RelativePath=".\src\main\activemq\util\Queue.h"
+ RelativePath=".\src\main\cms\Queue.h"
>
</File>
<File