Author: shuston
Date: Tue Nov 18 16:07:58 2008
New Revision: 718813
URL: http://svn.apache.org/viewvc?rev=718813&view=rev
Log:
Change formats to VC9, add MaxMethodBodySize and remove it from
protocol_gen.mak; resolved QPID-1473
Added:
incubator/qpid/trunk/qpid/cpp/src/MaxMethodBodySize.vcproj
Modified:
incubator/qpid/trunk/qpid/cpp/src/broker.vcproj
incubator/qpid/trunk/qpid/cpp/src/client.vcproj
incubator/qpid/trunk/qpid/cpp/src/common.vcproj
incubator/qpid/trunk/qpid/cpp/src/protocol_gen.mak
incubator/qpid/trunk/qpid/cpp/src/qpid.sln
Added: incubator/qpid/trunk/qpid/cpp/src/MaxMethodBodySize.vcproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/MaxMethodBodySize.vcproj?rev=718813&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/MaxMethodBodySize.vcproj (added)
+++ incubator/qpid/trunk/qpid/cpp/src/MaxMethodBodySize.vcproj Tue Nov 18
16:07:58 2008
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="MaxMethodBodySize"
+ ProjectGUID="{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}"
+ RootNamespace="MaxMethodBodySize"
+ Keyword="Win32Proj"
+ SignManifests="true"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Static_Debug"
+
IntermediateDirectory="Static_Debug\MaxMethodBodySize\I386"
+ ConfigurationType="1"
+ CharacterSet="0"
+
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ AdditionalOptions=""
+ AdditionalIncludeDirectories=""
+ TypeLibraryName="$(InputName).tlb"
+ HeaderFileName="$(InputName).h"
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ RuntimeTypeInfo="true"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4800;4355"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;NOMINMAX"
+ Culture="1033"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+
OutputFile="$(OutDir)\generate_MaxMethodBodySize_h.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+
CommandLine="$(OutDir)\generate_MaxMethodBodySize_h"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Static_Release"
+
IntermediateDirectory="Static_Release\MaxMethodBodySize\I386"
+ ConfigurationType="1"
+ CharacterSet="0"
+
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ AdditionalOptions=""
+ AdditionalIncludeDirectories=""
+ TypeLibraryName="$(InputName).tlb"
+ HeaderFileName="$(InputName).h"
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX"
+ RuntimeLibrary="0"
+ RuntimeTypeInfo="true"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DisableSpecificWarnings="4244;4800;4355"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;NOMINMAX"
+ Culture="1033"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+
OutputFile="$(OutDir)\generate_MaxMethodBodySize_h.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+
CommandLine="$(OutDir)\generate_MaxMethodBodySize_h"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="Static_Debug"
+
IntermediateDirectory="Static_Debug\MaxMethodBodySize\AMD64"
+ ConfigurationType="1"
+ CharacterSet="0"
+
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ AdditionalOptions=""
+ AdditionalIncludeDirectories=""
+ TypeLibraryName="$(InputName).tlb"
+ HeaderFileName="$(InputName).h"
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ RuntimeTypeInfo="true"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4800;4355"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;NOMINMAX;_WIN64"
+ Culture="1033"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies=""
+
OutputFile="$(OutDir)\generate_MaxMethodBodySize_h.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+
CommandLine="$(OutDir)\generate_MaxMethodBodySize_h"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="Static_Release"
+
IntermediateDirectory="Static_Release\MaxMethodBodySize\AMD64"
+ ConfigurationType="1"
+ CharacterSet="0"
+
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ AdditionalOptions=""
+ AdditionalIncludeDirectories=""
+ TypeLibraryName="$(InputName).tlb"
+ HeaderFileName="$(InputName).h"
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX"
+ RuntimeLibrary="0"
+ RuntimeTypeInfo="true"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DisableSpecificWarnings="4244;4800;4355"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;NOMINMAX;_WIN64"
+ Culture="1033"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies=""
+
OutputFile="$(OutDir)\generate_MaxMethodBodySize_h.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+
CommandLine="$(OutDir)\generate_MaxMethodBodySize_h"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;cxx;cc;C;c">
+ <File
+
RelativePath="gen\generate_MaxMethodBodySize_h.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hh">
+ <File
+ RelativePath="qpidd.h">
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: incubator/qpid/trunk/qpid/cpp/src/broker.vcproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker.vcproj?rev=718813&r1=718812&r2=718813&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker.vcproj (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker.vcproj Tue Nov 18 16:07:58 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="broker"
ProjectGUID="{09613D48-FECA-1BAD-9D20-8C374564ADCF}"
RootNamespace="broker"
@@ -51,8 +51,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -69,7 +69,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -133,8 +133,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
WarningLevel="3"
@@ -148,7 +148,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -214,8 +214,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -232,7 +232,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_WIN64"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -297,8 +297,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
WarningLevel="3"
@@ -312,7 +312,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_WIN64"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -403,9 +403,18 @@
RelativePath="gen\qmf\org\apache\qpid\broker\EventBrokerDisconnect.cpp">
</File>
<File
+
RelativePath="gen\qmf\org\apache\qpid\broker\EventBrokerLinkDown.cpp">
+ </File>
+ <File
+
RelativePath="gen\qmf\org\apache\qpid\broker\EventBrokerLinkUp.cpp">
+ </File>
+ <File
RelativePath="gen\qmf\org\apache\qpid\broker\EventClientConnect.cpp">
</File>
<File
+
RelativePath="gen\qmf\org\apache\qpid\broker\EventClientConnectFail.cpp">
+ </File>
+ <File
RelativePath="gen\qmf\org\apache\qpid\broker\EventClientDisconnect.cpp">
</File>
<File
@@ -947,9 +956,18 @@
RelativePath="gen\qmf\org\apache\qpid\broker\EventBrokerDisconnect.h">
</File>
<File
+
RelativePath="gen\qmf\org\apache\qpid\broker\EventBrokerLinkDown.h">
+ </File>
+ <File
+
RelativePath="gen\qmf\org\apache\qpid\broker\EventBrokerLinkUp.h">
+ </File>
+ <File
RelativePath="gen\qmf\org\apache\qpid\broker\EventClientConnect.h">
</File>
<File
+
RelativePath="gen\qmf\org\apache\qpid\broker\EventClientConnectFail.h">
+ </File>
+ <File
RelativePath="gen\qmf\org\apache\qpid\broker\EventClientDisconnect.h">
</File>
<File
Modified: incubator/qpid/trunk/qpid/cpp/src/client.vcproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client.vcproj?rev=718813&r1=718812&r2=718813&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client.vcproj (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client.vcproj Tue Nov 18 16:07:58 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="client"
ProjectGUID="{6961DBA3-FECA-1BAD-F396-8C394564ADCF}"
RootNamespace="client"
@@ -51,8 +51,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -69,7 +69,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -126,8 +126,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
WarningLevel="3"
@@ -141,7 +141,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -198,8 +198,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -216,7 +216,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -273,8 +273,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
WarningLevel="3"
@@ -288,7 +288,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
Modified: incubator/qpid/trunk/qpid/cpp/src/common.vcproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/common.vcproj?rev=718813&r1=718812&r2=718813&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/common.vcproj (original)
+++ incubator/qpid/trunk/qpid/cpp/src/common.vcproj Tue Nov 18 16:07:58 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="common"
ProjectGUID="{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"
RootNamespace="common"
@@ -51,8 +51,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -69,7 +69,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -126,8 +126,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
WarningLevel="3"
@@ -141,7 +141,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -198,8 +198,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -216,7 +216,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_WIN64"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -273,8 +273,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
-
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
WarningLevel="3"
@@ -288,7 +288,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_WIN64"
Culture="1033"
-
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT),.,gen"
+
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
<Tool
Name="VCPreLinkEventTool"
Modified: incubator/qpid/trunk/qpid/cpp/src/protocol_gen.mak
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/protocol_gen.mak?rev=718813&r1=718812&r2=718813&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/protocol_gen.mak (original)
+++ incubator/qpid/trunk/qpid/cpp/src/protocol_gen.mak Tue Nov 18 16:07:58 2008
@@ -18,19 +18,11 @@
# To add cluser management, add the next line to mgen_specs:
# .\qpid\cluster\management-schema.xml
-all: rubygen.mk managementgen.mk qpid\framing\MaxMethodBodySize.h
+all: rubygen.mk gen\generate_MaxMethodBodySize_h.cpp managementgen.mk
rubygen.mk gen\generate_MaxMethodBodySize_h.cpp: $(specs)
ruby -I $(rgen_dir) $(rgen_dir)\generate gen $(specs) all rubygen.mk
-CPPFLAGS = /Od /I. /Igen /I"$(BOOST_ROOT)" /I"$(BOOST_ROOT)/include" /DWIN32
/D_CONSOLE /D_CRT_NONSTDC_NO_WARNINGS /DNOMINMAX /FD /EHsc /RTC1 /MTd /W3 /Zi
/TP
-
-generate_MaxMethodBodySize_h.exe: gen/generate_MaxMethodBodySize_h.cpp
- $(CPP) $(CPPFLAGS) gen/generate_MaxMethodBodySize_h.cpp
-
-qpid\framing\MaxMethodBodySize.h: generate_MaxMethodBodySize_h.exe
- .\generate_MaxMethodBodySize_h
-
# Management code generation... uses Python
managementgen.mk: $(mgmt_specs)
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid.sln
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid.sln?rev=718813&r1=718812&r2=718813&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid.sln (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid.sln Tue Nov 18 16:07:58 2008
@@ -1,13 +1,15 @@

-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1456 2008-07-18 16:05:54Z elliott_c $
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1439 2008-07-10 14:31:19Z elliott_c $
#
# This file was generated by MPC. Any changes made directly to
# this file will be lost the next time it is generated.
#
# MPC Command:
-# C:\ace\MPC\mwc.pl -type vc8 -features boost=1 -static qpid.mwc
+# C:\ace\MPC\mwc.pl -type vc9 -features boost=1 -static qpid.mwc
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMethodBodySize",
"MaxMethodBodySize.vcproj", "{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broker", "broker.vcproj",
"{09613D48-FECA-1BAD-9D20-8C374564ADCF}"
ProjectSection(ProjectDependencies) = postProject
{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF} =
{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}
@@ -19,6 +21,9 @@
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj",
"{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"
+ ProjectSection(ProjectDependencies) = postProject
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF} =
{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,6 +33,14 @@
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.Build.0 =
Debug|Win32
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.ActiveCfg =
Debug|x64
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.Build.0 =
Debug|x64
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.ActiveCfg
= Release|Win32
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.Build.0 =
Release|Win32
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.ActiveCfg =
Release|x64
+ {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.Build.0 =
Release|x64
{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.ActiveCfg =
Debug|Win32
{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.Build.0 =
Debug|Win32
{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.ActiveCfg =
Debug|x64
