summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2009-03-05 17:59:03 +0000
committerStephen D. Huston <shuston@apache.org>2009-03-05 17:59:03 +0000
commitd7024aabb75e10e1131392a7f3493722b2da31fe (patch)
treee0b91a10c80c4e854b22a7a1702ef94cd3096da3
parent5a9a6e8a13e80f9c47c0b56f6cb7bd3fd3c895cf (diff)
downloadqpid-python-d7024aabb75e10e1131392a7f3493722b2da31fe.tar.gz
Add deploy step for headers and built result
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-1673@750525 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/client.vcproj4
-rw-r--r--qpid/cpp/src/common.vcproj4
-rw-r--r--qpid/cpp/src/qmfconsole.vcproj194
3 files changed, 95 insertions, 107 deletions
diff --git a/qpid/cpp/src/client.vcproj b/qpid/cpp/src/client.vcproj
index ad8584ee3e..be3ff8fe82 100644
--- a/qpid/cpp/src/client.vcproj
+++ b/qpid/cpp/src/client.vcproj
@@ -121,6 +121,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\client\no_keyword mkdir deploy\include\qpid\client\no_keyword&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\client\*.h deploy\include\qpid\client\&#x0D;&#x0A;@copy /Y gen\qpid\client\*.h deploy\include\qpid\client\&#x0D;&#x0A;@copy /Y gen\qpid\client\no_keyword\*.h deploy\include\qpid\client\no_keyword\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidclientd.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidclientd.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@@ -203,6 +204,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\client\no_keyword mkdir deploy\include\qpid\client\no_keyword&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\client\*.h deploy\include\qpid\client\&#x0D;&#x0A;@copy /Y gen\qpid\client\*.h deploy\include\qpid\client\&#x0D;&#x0A;@copy /Y gen\qpid\client\no_keyword\*.h deploy\include\qpid\client\no_keyword\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidclient.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidclient.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@@ -287,6 +289,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\client\no_keyword mkdir deploy\include\qpid\client\no_keyword&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\client\*.h deploy\include\qpid\client\&#x0D;&#x0A;@copy /Y gen\qpid\client\*.h deploy\include\qpid\client\&#x0D;&#x0A;@copy /Y gen\qpid\client\no_keyword\*.h deploy\include\qpid\client\no_keyword\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidclientd.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidclientd.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@@ -370,6 +373,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\client\no_keyword mkdir deploy\include\qpid\client\no_keyword&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\client\*.h deploy\include\qpid\client\&#x0D;&#x0A;@copy /Y gen\qpid\client\*.h deploy\include\qpid\client\&#x0D;&#x0A;@copy /Y gen\qpid\client\no_keyword\*.h deploy\include\qpid\client\no_keyword\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidclient.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidclient.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
diff --git a/qpid/cpp/src/common.vcproj b/qpid/cpp/src/common.vcproj
index 31cb493bd1..f65dff2ecb 100644
--- a/qpid/cpp/src/common.vcproj
+++ b/qpid/cpp/src/common.vcproj
@@ -121,6 +121,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid mkdir deploy\include\qpid&#x0D;&#x0A;@if not exist deploy\include\qpid\amqp_0_10 mkdir deploy\include\qpid\amqp_0_10&#x0D;&#x0A;@if not exist deploy\include\qpid\framing mkdir deploy\include\qpid\framing&#x0D;&#x0A;@if not exist deploy\include\qpid\sys\windows mkdir deploy\include\qpid\sys\windows&#x0D;&#x0A;@if not exist deploy\include\qpid\log\windows mkdir deploy\include\qpid\log\windows&#x0D;&#x0A;@if not exist deploy\include\qpid\management mkdir deploy\include\qpid\management&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\*.h deploy\include\qpid\&#x0D;&#x0A;@copy /Y qpid\amqp_0_10\*.h deploy\include\qpid\amqp_0_10\&#x0D;&#x0A;@copy /Y qpid\framing\*.h deploy\include\qpid\framing\&#x0D;&#x0A;@copy /Y qpid\sys\*.h deploy\include\qpid\sys\&#x0D;&#x0A;@copy /Y qpid\sys\windows\*.h deploy\include\qpid\sys\windows\&#x0D;&#x0A;@copy /Y qpid\log\*.h deploy\include\qpid\log\&#x0D;&#x0A;@copy /Y qpid\log\windows\*.h deploy\include\qpid\log\windows\&#x0D;&#x0A;@copy /Y qpid\management\*.h deploy\include\qpid\management\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidcommond.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidcommond.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@@ -203,6 +204,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid mkdir deploy\include\qpid&#x0D;&#x0A;@if not exist deploy\include\qpid\amqp_0_10 mkdir deploy\include\qpid\amqp_0_10&#x0D;&#x0A;@if not exist deploy\include\qpid\framing mkdir deploy\include\qpid\framing&#x0D;&#x0A;@if not exist deploy\include\qpid\sys\windows mkdir deploy\include\qpid\sys\windows&#x0D;&#x0A;@if not exist deploy\include\qpid\log\windows mkdir deploy\include\qpid\log\windows&#x0D;&#x0A;@if not exist deploy\include\qpid\management mkdir deploy\include\qpid\management&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\*.h deploy\include\qpid\&#x0D;&#x0A;@copy /Y qpid\amqp_0_10\*.h deploy\include\qpid\amqp_0_10\&#x0D;&#x0A;@copy /Y qpid\framing\*.h deploy\include\qpid\framing\&#x0D;&#x0A;@copy /Y qpid\sys\*.h deploy\include\qpid\sys\&#x0D;&#x0A;@copy /Y qpid\sys\windows\*.h deploy\include\qpid\sys\windows\&#x0D;&#x0A;@copy /Y qpid\log\*.h deploy\include\qpid\log\&#x0D;&#x0A;@copy /Y qpid\log\windows\*.h deploy\include\qpid\log\windows\&#x0D;&#x0A;@copy /Y qpid\management\*.h deploy\include\qpid\management\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidcommon.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidcommon.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@@ -287,6 +289,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid mkdir deploy\include\qpid&#x0D;&#x0A;@if not exist deploy\include\qpid\amqp_0_10 mkdir deploy\include\qpid\amqp_0_10&#x0D;&#x0A;@if not exist deploy\include\qpid\framing mkdir deploy\include\qpid\framing&#x0D;&#x0A;@if not exist deploy\include\qpid\sys\windows mkdir deploy\include\qpid\sys\windows&#x0D;&#x0A;@if not exist deploy\include\qpid\log\windows mkdir deploy\include\qpid\log\windows&#x0D;&#x0A;@if not exist deploy\include\qpid\management mkdir deploy\include\qpid\management&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\*.h deploy\include\qpid\&#x0D;&#x0A;@copy /Y qpid\amqp_0_10\*.h deploy\include\qpid\amqp_0_10\&#x0D;&#x0A;@copy /Y qpid\framing\*.h deploy\include\qpid\framing\&#x0D;&#x0A;@copy /Y qpid\sys\*.h deploy\include\qpid\sys\&#x0D;&#x0A;@copy /Y qpid\sys\windows\*.h deploy\include\qpid\sys\windows\&#x0D;&#x0A;@copy /Y qpid\log\*.h deploy\include\qpid\log\&#x0D;&#x0A;@copy /Y qpid\log\windows\*.h deploy\include\qpid\log\windows\&#x0D;&#x0A;@copy /Y qpid\management\*.h deploy\include\qpid\management\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidcommond.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidcommond.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@@ -370,6 +373,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid mkdir deploy\include\qpid&#x0D;&#x0A;@if not exist deploy\include\qpid\amqp_0_10 mkdir deploy\include\qpid\amqp_0_10&#x0D;&#x0A;@if not exist deploy\include\qpid\framing mkdir deploy\include\qpid\framing&#x0D;&#x0A;@if not exist deploy\include\qpid\sys\windows mkdir deploy\include\qpid\sys\windows&#x0D;&#x0A;@if not exist deploy\include\qpid\log\windows mkdir deploy\include\qpid\log\windows&#x0D;&#x0A;@if not exist deploy\include\qpid\management mkdir deploy\include\qpid\management&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\*.h deploy\include\qpid\&#x0D;&#x0A;@copy /Y qpid\amqp_0_10\*.h deploy\include\qpid\amqp_0_10\&#x0D;&#x0A;@copy /Y qpid\framing\*.h deploy\include\qpid\framing\&#x0D;&#x0A;@copy /Y qpid\sys\*.h deploy\include\qpid\sys\&#x0D;&#x0A;@copy /Y qpid\sys\windows\*.h deploy\include\qpid\sys\windows\&#x0D;&#x0A;@copy /Y qpid\log\*.h deploy\include\qpid\log\&#x0D;&#x0A;@copy /Y qpid\log\windows\*.h deploy\include\qpid\log\windows\&#x0D;&#x0A;@copy /Y qpid\management\*.h deploy\include\qpid\management\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidcommon.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidcommon.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
diff --git a/qpid/cpp/src/qmfconsole.vcproj b/qpid/cpp/src/qmfconsole.vcproj
index 49fd065c8e..ee7d7fc74b 100644
--- a/qpid/cpp/src/qmfconsole.vcproj
+++ b/qpid/cpp/src/qmfconsole.vcproj
@@ -1,4 +1,25 @@
<?xml version="1.0" encoding="Windows-1252"?>
+<!--
+
+ 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.
+
+-->
+
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
@@ -6,7 +27,7 @@
ProjectGUID="{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}"
RootNamespace="qmfconsole"
Keyword="Win32Proj"
- TargetFrameworkVersion="0"
+ SignManifests="true"
>
<Platforms>
<Platform
@@ -25,6 +46,7 @@
IntermediateDirectory="Debug\qmfconsole\I386"
ConfigurationType="2"
CharacterSet="0"
+
>
<Tool
Name="VCPreBuildEventTool"
@@ -51,7 +73,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
- PreprocessorDefinitions="CONSOLE_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="CONSOLE_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -75,7 +97,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="qpidclientd.lib qpidcommond.lib"
+ AdditionalDependencies="qpidcommond.lib qpidclientd.lib"
OutputFile="$(OutDir)\qmfconsoled.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -89,9 +111,6 @@
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -101,18 +120,17 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\console mkdir deploy\include\qpid\console&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\console\*.h deploy\include\qpid\console\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qmfconsoled.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qmfconsoled.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|Win32"
OutputDirectory="."
- IntermediateDirectory="Debug\qmfconsole\AMD64"
+ IntermediateDirectory="Release\qmfconsole\I386"
ConfigurationType="2"
CharacterSet="0"
+
>
<Tool
Name="VCPreBuildEventTool"
@@ -137,16 +155,13 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
- PreprocessorDefinitions="CONSOLE_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="CONSOLE_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"
+ RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
DisableSpecificWarnings="4244;4800;4355"
/>
<Tool
@@ -154,7 +169,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"
+ PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN"
Culture="1033"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
@@ -163,24 +178,22 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/machine:AMD64"
- AdditionalDependencies="qpidclientd.lib"
- OutputFile="$(OutDir)\qmfconsoled.dll"
- LinkIncremental="2"
+ AdditionalDependencies="qpidcommon.lib qpidclient.lib"
+ OutputFile="$(OutDir)\qmfconsole.dll"
+ LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary=".\qmfconsoled.lib"
- TargetMachine="17"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary=".\qmfconsole.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -190,18 +203,17 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\console mkdir deploy\include\qpid\console&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\console\*.h deploy\include\qpid\console\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qmfconsole.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qmfconsole.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="."
- IntermediateDirectory="Release\qmfconsole\I386"
+ IntermediateDirectory="Debug\qmfconsole\AMD64"
ConfigurationType="2"
CharacterSet="0"
+
>
<Tool
Name="VCPreBuildEventTool"
@@ -226,13 +238,16 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
+ Optimization="0"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
- PreprocessorDefinitions="CONSOLE_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="CONSOLE_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
RuntimeTypeInfo="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4244;4800;4355"
/>
<Tool
@@ -240,7 +255,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"
Culture="1033"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
@@ -249,25 +264,21 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="qpidclient.lib"
- OutputFile="$(OutDir)\qmfconsole.dll"
- LinkIncremental="1"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies="qpidcommond.lib qpidclientd.lib"
+ OutputFile="$(OutDir)\qmfconsoled.dll"
+ LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
GenerateDebugInformation="true"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ImportLibrary=".\qmfconsole.lib"
- TargetMachine="1"
+ ImportLibrary=".\qmfconsoled.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -277,10 +288,8 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\console mkdir deploy\include\qpid\console&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\console\*.h deploy\include\qpid\console\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qmfconsoled.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qmfconsoled.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@@ -289,6 +298,7 @@
IntermediateDirectory="Release\qmfconsole\AMD64"
ConfigurationType="2"
CharacterSet="0"
+
>
<Tool
Name="VCPreBuildEventTool"
@@ -315,7 +325,7 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
- PreprocessorDefinitions="CONSOLE_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="CONSOLE_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="3"
@@ -337,7 +347,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
- AdditionalDependencies="qpidclient.lib"
+ AdditionalDependencies="qpidcommon.lib qpidclient.lib"
OutputFile="$(OutDir)\qmfconsole.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -353,9 +363,6 @@
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -365,10 +372,8 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\console mkdir deploy\include\qpid\console&#x0D;&#x0A;@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y qpid\console\*.h deploy\include\qpid\console\&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qmfconsole.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qmfconsole.lib deploy\lib\&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
@@ -377,104 +382,79 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;cxx;cc;C;c"
- >
+ Filter="cpp;cxx;cc;C;c">
<File
- RelativePath="qpid\console\Agent.cpp"
- >
+ RelativePath="qpid\console\Agent.cpp">
</File>
<File
- RelativePath="qpid\console\Broker.cpp"
- >
+ RelativePath="qpid\console\Broker.cpp">
</File>
<File
- RelativePath="qpid\console\ClassKey.cpp"
- >
+ RelativePath="qpid\console\ClassKey.cpp">
</File>
<File
- RelativePath="qpid\console\Event.cpp"
- >
+ RelativePath="qpid\console\Event.cpp">
</File>
<File
- RelativePath="qpid\console\Object.cpp"
- >
+ RelativePath="qpid\console\Object.cpp">
</File>
<File
- RelativePath="qpid\console\ObjectId.cpp"
- >
+ RelativePath="qpid\console\ObjectId.cpp">
</File>
<File
- RelativePath="qpid\console\Package.cpp"
- >
+ RelativePath="qpid\console\Package.cpp">
</File>
<File
- RelativePath="qpid\console\Schema.cpp"
- >
+ RelativePath="qpid\console\Schema.cpp">
</File>
<File
- RelativePath="qpid\console\SequenceManager.cpp"
- >
+ RelativePath="qpid\console\SequenceManager.cpp">
</File>
<File
- RelativePath="qpid\console\SessionManager.cpp"
- >
+ RelativePath="qpid\console\SessionManager.cpp">
</File>
<File
- RelativePath="qpid\console\Value.cpp"
- >
+ RelativePath="qpid\console\Value.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hh"
- >
+ Filter="h;hpp;hxx;hh">
<File
- RelativePath="qpid\console\Agent.h"
- >
+ RelativePath="qpid\console\Agent.h">
</File>
<File
- RelativePath="qpid\console\Broker.h"
- >
+ RelativePath="qpid\console\Broker.h">
</File>
<File
- RelativePath="qpid\console\ClassKey.h"
- >
+ RelativePath="qpid\console\ClassKey.h">
</File>
<File
- RelativePath="qpid\console\ConsoleListener.h"
- >
+ RelativePath="qpid\console\ConsoleListener.h">
</File>
<File
- RelativePath="qpid\console\Event.h"
- >
+ RelativePath="qpid\console\Event.h">
</File>
<File
- RelativePath="qpid\console\Object.h"
- >
+ RelativePath="qpid\console\Object.h">
</File>
<File
- RelativePath="qpid\console\ObjectId.h"
- >
+ RelativePath="qpid\console\ObjectId.h">
</File>
<File
- RelativePath="qpid\console\Package.h"
- >
+ RelativePath="qpid\console\Package.h">
</File>
<File
- RelativePath="qpid\console\Schema.h"
- >
+ RelativePath="qpid\console\Schema.h">
</File>
<File
- RelativePath="qpid\console\SequenceManager.h"
- >
+ RelativePath="qpid\console\SequenceManager.h">
</File>
<File
- RelativePath="qpid\console\SessionManager.h"
- >
+ RelativePath="qpid\console\SessionManager.h">
</File>
<File
- RelativePath="qpid\console\Value.h"
- >
+ RelativePath="qpid\console\Value.h">
</File>
</Filter>
</Files>