You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2014/09/12 20:23:34 UTC
svn commit: r1624604 [2/3] - in /qpid/trunk/qpid/cpp: ./ bindings/
bindings/qpid/dotnet/
bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/
bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/
bindings/qpid/dotnet/examples/msvc10/csharp...
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in Fri Sep 12 18:23:31 2014
@@ -30,7 +30,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>csharp.example.spout</RootNamespace>
<AssemblyName>csharp.example.spout</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -40,14 +40,14 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -55,7 +55,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -64,14 +64,14 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -79,7 +79,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -90,18 +90,26 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\csharp.example.spout\csharp.example.spout.cs" />
- <Compile Include="..\..\csharp.example.spout\Options.cs" />
- <Compile Include="..\..\csharp.example.spout\Properties\AssemblyInfo.cs" />
+ <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\csharp.example.spout.cs">
+ <Link>csharp.example.spout.cs</Link>
+ </Compile>
+ <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Options.cs">
+ <Link>Options.cs</Link>
+ </Compile>
+ <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Properties\AssemblyInfo.cs">
+ <Link>AssemblyInfo.cs</Link>
+ </Compile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
+ <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
<Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
<Name>Org.Apache.Qpid.Messaging</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="app.config" />
+ <None Include="${DOTNET_exampleRelPathToAppConfig}">
+ <Link>App.Config</Link>
+ </None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in Fri Sep 12 18:23:31 2014
@@ -30,7 +30,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>csharp.map.callback.receiver</RootNamespace>
<AssemblyName>csharp.map.callback.receiver</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -40,14 +40,14 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -55,7 +55,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -64,14 +64,14 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -79,7 +79,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -90,21 +90,27 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\csharp.map.callback.receiver\csharp.map.callback.receiver.cs" />
- <Compile Include="..\..\csharp.map.callback.receiver\Properties\AssemblyInfo.cs" />
+ <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\csharp.map.callback.receiver.cs">
+ <Link>csharp.map.callback.receiver.cs</Link>
+ </Compile>
+ <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\Properties\AssemblyInfo.cs">
+ <Link>AssemblyInfo.cs</Link>
+ </Compile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
+ <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
<Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
<Name>Org.Apache.Qpid.Messaging</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\src\sessionreceiver\msvc10\org.apache.qpid.messaging.sessionreceiver.csproj">
+ <ProjectReference Include="${DOTNET_exampleRelPathToSessionreceiverProj}">
<Project>{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}</Project>
<Name>org.apache.qpid.messaging.sessionreceiver</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="app.config" />
+ <None Include="${DOTNET_exampleRelPathToAppConfig}">
+ <Link>App.Config</Link>
+ </None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in Fri Sep 12 18:23:31 2014
@@ -30,7 +30,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>csharp.map.callback.sender</RootNamespace>
<AssemblyName>csharp.map.callback.sender</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
@@ -48,7 +48,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -56,7 +56,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -65,7 +65,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
@@ -73,7 +73,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -81,7 +81,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
- <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+ <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -92,17 +92,23 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\csharp.map.callback.sender\csharp.map.callback.sender.cs" />
- <Compile Include="..\..\csharp.map.callback.sender\Properties\AssemblyInfo.cs" />
+ <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\csharp.map.callback.sender.cs">
+ <Link>csharp.map.callback.sender.cs</Link>
+ </Compile>
+ <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\Properties\AssemblyInfo.cs">
+ <Link>AssemblyInfo.cs</Link>
+ </Compile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
+ <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
<Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
<Name>Org.Apache.Qpid.Messaging</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="app.config" />
+ <None Include="${DOTNET_exampleRelPathToAppConfig}">
+ <Link>App.Config</Link>
+ </None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in Fri Sep 12 18:23:31 2014
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -19,9 +19,9 @@ Microsoft Visual Studio Solution File, F
# under the License
#
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "..\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "${CMAKE_CURRENT_BINARY_DIR}\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${CMAKE_CURRENT_BINARY_DIR}\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in Fri Sep 12 18:23:31 2014
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
#
# Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ Microsoft Visual Studio Solution File, F
# under the License
#
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "..\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "${CMAKE_CURRENT_BINARY_DIR}\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{34C477FB-B0CC-4AB9-A346-EA7B055469AC}"
EndProject
@@ -28,58 +28,58 @@ Project("{2150E333-8FDC-42A3-9474-1A3956
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pub-Sub", "Pub-Sub", "{878FDDF8-A870-41D6-9E36-0A050EC5ACAB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "..\examples\msvc9\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "..\examples\msvc9\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{39E9D1BF-3A0B-4D86-BF6B-F463E1A2245A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "..\test\messaging.test\msvc9\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "${CMAKE_CURRENT_BINARY_DIR}\test\messaging.test\msvc9\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StructuredMessage", "StructuredMessage", "{E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "..\examples\msvc9\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "..\examples\msvc9\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${CMAKE_CURRENT_BINARY_DIR}\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "..\examples\msvc9\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "..\examples\msvc9\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client-Server", "Client-Server", "{9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "..\examples\msvc9\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "..\examples\msvc9\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drain-Spout", "Drain-Spout", "{89CE04CB-21DE-4ABB-9236-50529DD8C022}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "..\examples\msvc9\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "..\examples\msvc9\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "..\examples\msvc9\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hello World", "Hello World", "{4408A2DA-ED2D-44AE-A465-0B6D75E1FF86}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "..\examples\msvc9\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in Fri Sep 12 18:23:31 2014
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
#
# Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,9 @@ Microsoft Visual Studio Solution File, F
# under the License
#
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "..\src\msvc10\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "${DOTNET_currentBinaryDir}\src\msvcx\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc10\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${DOTNET_currentBinaryDir}\src\sessionreceiver\msvcx\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in Fri Sep 12 18:23:31 2014
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
#
# Licensed to the Apache Software Foundation (ASF) under one
@@ -34,50 +34,50 @@ Project("{2150E333-8FDC-42A3-9474-1A3956
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drain-Spout", "Drain-Spout", "{89CE04CB-21DE-4ABB-9236-50529DD8C022}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "..\src\msvc10\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "${DOTNET_currentBinaryDir}\src\msvcx\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "..\examples\msvc10\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "..\examples\msvc10\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "..\test\messaging.test\msvc10\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "${DOTNET_currentBinaryDir}\test\messaging.test\msvcx\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "..\examples\msvc10\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "..\examples\msvc10\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"
ProjectSection(ProjectDependencies) = postProject
{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc10\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${DOTNET_currentBinaryDir}\src\sessionreceiver\msvcx\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "..\examples\msvc10\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "..\examples\msvc10\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "..\examples\msvc10\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "..\examples\msvc10\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "..\examples\msvc10\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "..\examples\msvc10\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "..\examples\msvc10\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "..\examples\msvc10\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in Fri Sep 12 18:23:31 2014
@@ -41,8 +41,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+ IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -67,7 +67,7 @@
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\..\include";"$(ProjectDir)..\..\..\..\..\src""
+ AdditionalIncludeDirectories=""${PROJECT_SOURCE_DIR}\include";"${PROJECT_SOURCE_DIR}\src""
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -86,13 +86,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386"
- AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclientd.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommond.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessagingd.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypesd.lib"
- OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+ AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclientd.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommond.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessagingd.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypesd.lib"
+ OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
AssemblyDebug="1"
TargetMachine="1"
- KeyFile="..\qpid.snk"
+ KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
/>
<Tool
Name="VCALinkTool"
@@ -119,8 +119,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+ IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -146,7 +146,7 @@
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\..\include";"$(ProjectDir)..\..\..\..\..\src""
+ AdditionalIncludeDirectories=""${PROJECT_SOURCE_DIR}\include";"${PROJECT_SOURCE_DIR}\src""
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -165,13 +165,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000"
- AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclientd.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommond.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessagingd.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypesd.lib"
- OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+ AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclientd.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommond.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessagingd.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypesd.lib"
+ OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
AssemblyDebug="1"
TargetMachine="17"
- KeyFile="..\qpid.snk"
+ KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
/>
<Tool
Name="VCALinkTool"
@@ -198,8 +198,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+ IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -224,7 +224,7 @@
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\..\include";"$(ProjectDir)..\..\..\..\..\src""
+ AdditionalIncludeDirectories=""${PROJECT_SOURCE_DIR}\include";"${PROJECT_SOURCE_DIR}\src""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -243,13 +243,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386"
- AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclient.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommon.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessaging.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypes.lib"
- OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+ AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclient.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommon.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessaging.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypes.lib"
+ OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
AssemblyDebug="1"
TargetMachine="1"
- KeyFile="..\qpid.snk"
+ KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
/>
<Tool
Name="VCALinkTool"
@@ -275,8 +275,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+ IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -302,7 +302,7 @@
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\..\include";"$(ProjectDir)..\..\..\..\..\src""
+ AdditionalIncludeDirectories=""${PROJECT_SOURCE_DIR}\include";"${PROJECT_SOURCE_DIR}\src""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -321,13 +321,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000"
- AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclient.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommon.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessaging.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypes.lib"
- OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+ AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclient.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommon.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessaging.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypes.lib"
+ OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
AssemblyDebug="1"
TargetMachine="17"
- KeyFile="..\qpid.snk"
+ KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
/>
<Tool
Name="VCALinkTool"
@@ -353,8 +353,8 @@
</Configuration>
<Configuration
Name="RelWithDebInfo|Win32"
- OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+ IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -379,7 +379,7 @@
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\..\include";"$(ProjectDir)..\..\..\..\..\src""
+ AdditionalIncludeDirectories=""${PROJECT_SOURCE_DIR}\include";"${PROJECT_SOURCE_DIR}\src""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -398,13 +398,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386"
- AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclient.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommon.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessaging.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypes.lib"
- OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+ AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclient.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommon.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessaging.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypes.lib"
+ OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
AssemblyDebug="1"
TargetMachine="1"
- KeyFile="..\qpid.snk"
+ KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
/>
<Tool
Name="VCALinkTool"
@@ -430,8 +430,8 @@
</Configuration>
<Configuration
Name="RelWithDebInfo|x64"
- OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+ IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -457,7 +457,7 @@
Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\..\include";"$(ProjectDir)..\..\..\..\..\src""
+ AdditionalIncludeDirectories=""${PROJECT_SOURCE_DIR}\include";"${PROJECT_SOURCE_DIR}\src""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -476,13 +476,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000"
- AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclient.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommon.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessaging.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypes.lib"
- OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+ AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclient.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommon.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessaging.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypes.lib"
+ OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
AssemblyDebug="1"
TargetMachine="17"
- KeyFile="..\qpid.snk"
+ KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
/>
<Tool
Name="VCALinkTool"
@@ -526,43 +526,43 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\Address.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Address.cpp"
>
</File>
<File
- RelativePath="$(QPID_BUILD_ROOT)\src\windows\generated_src\AssemblyInfo.cpp"
+ RelativePath="${PROJECT_BINARY_DIR}\src\windows\generated_src\AssemblyInfo.cpp"
>
</File>
<File
- RelativePath="..\Connection.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Connection.cpp"
>
</File>
<File
- RelativePath="..\FailoverUpdates.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\FailoverUpdates.cpp"
>
</File>
<File
- RelativePath="..\Logger.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Logger.cpp"
>
</File>
<File
- RelativePath="..\Message.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Message.cpp"
>
</File>
<File
- RelativePath="..\Receiver.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Receiver.cpp"
>
</File>
<File
- RelativePath="..\Sender.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Sender.cpp"
>
</File>
<File
- RelativePath="..\Session.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Session.cpp"
>
</File>
<File
- RelativePath="..\TypeTranslator.cpp"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\TypeTranslator.cpp"
>
</File>
</Filter>
@@ -572,55 +572,55 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\Address.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Address.h"
>
</File>
<File
- RelativePath="..\Connection.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Connection.h"
>
</File>
<File
- RelativePath="..\Duration.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Duration.h"
>
</File>
<File
- RelativePath="..\FailoverUpdates.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\FailoverUpdates.h"
>
</File>
<File
- RelativePath="..\Logger.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Logger.h"
>
</File>
<File
- RelativePath="..\Message.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Message.h"
>
</File>
<File
- RelativePath="..\QpidException.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\QpidException.h"
>
</File>
<File
- RelativePath="..\QpidMarshal.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\QpidMarshal.h"
>
</File>
<File
- RelativePath="..\QpidTypeCheck.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\QpidTypeCheck.h"
>
</File>
<File
- RelativePath="..\Receiver.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Receiver.h"
>
</File>
<File
- RelativePath="..\Sender.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Sender.h"
>
</File>
<File
- RelativePath="..\Session.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Session.h"
>
</File>
<File
- RelativePath="..\TypeTranslator.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\TypeTranslator.h"
>
</File>
</Filter>
@@ -630,20 +630,20 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\app.ico"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\app.ico"
>
</File>
<File
- RelativePath="$(QPID_BUILD_ROOT)\src\windows\resources\org.apache.qpid.messaging.rc"
+ RelativePath="${PROJECT_BINARY_DIR}\src\windows\resources\org.apache.qpid.messaging.rc"
>
</File>
<File
- RelativePath="..\resource1.h"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\resource1.h"
>
</File>
</Filter>
<File
- RelativePath="..\ReadMe.txt"
+ RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\ReadMe.txt"
>
</File>
</Files>
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in Fri Sep 12 18:23:31 2014
@@ -33,83 +33,83 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="Address.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Address.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="AssemblyInfo.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\AssemblyInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Connection.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Connection.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="FailoverUpdates.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\FailoverUpdates.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Message.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Message.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Receiver.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Receiver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Sender.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Sender.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Session.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Session.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="TypeTranslator.cpp">
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\TypeTranslator.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Address.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Address.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Connection.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Connection.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Duration.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Duration.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="FailoverUpdates.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\FailoverUpdates.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Message.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Message.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="QpidException.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidException.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="QpidMarshal.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidMarshal.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="QpidTypeCheck.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidTypeCheck.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Receiver.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Receiver.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Sender.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Sender.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Session.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Session.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="TypeTranslator.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\TypeTranslator.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource1.h">
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\resource1.h">
<Filter>Resource Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="app.ico">
+ <None Include="${DOTNET_currentSourceDir}\src\app.ico">
<Filter>Resource Files</Filter>
</None>
- <None Include="ReadMe.txt" />
+ <None Include="${DOTNET_currentSourceDir}\src\ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="$(QPID_BUILD_ROOT)\src\windows\resources\org.apache.qpid.messaging.rc">
+ <ResourceCompile Include="${DOTNET_projectBinaryDir}\src\windows\resources\org.apache.qpid.messaging.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in Fri Sep 12 18:23:31 2014
@@ -48,7 +48,7 @@
<ProjectGuid>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</ProjectGuid>
<RootNamespace>org.apache.qpid.messaging</RootNamespace>
<Keyword>ManagedCProj</Keyword>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
@@ -56,36 +56,42 @@
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>false</WholeProgramOptimization>
+ ${DOTNET_PLATFORM_TOOLSET}
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>false</WholeProgramOptimization>
+ ${DOTNET_PLATFORM_TOOLSET}
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>false</WholeProgramOptimization>
+ ${DOTNET_PLATFORM_TOOLSET}
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>false</WholeProgramOptimization>
+ ${DOTNET_PLATFORM_TOOLSET}
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>false</WholeProgramOptimization>
+ ${DOTNET_PLATFORM_TOOLSET}
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>false</WholeProgramOptimization>
+ ${DOTNET_PLATFORM_TOOLSET}
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -111,32 +117,32 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkIncremental>
- <LinkKeyFile>..\qpid.snk</LinkKeyFile>
+ <LinkKeyFile>${DOTNET_currentSourceDir}\src\qpid.snk</LinkKeyFile>
<LinkDelaySign>true</LinkDelaySign>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -145,15 +151,15 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclientd.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommond.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessagingd.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypesd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+ <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclientd.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommond.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessagingd.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypesd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+ <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -163,7 +169,7 @@
<ClCompile>
<AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -172,22 +178,22 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalOptions> /STACK:10000000 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclientd.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommond.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessagingd.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypesd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+ <AdditionalOptions> /STACK:10000000 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclientd.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommond.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessagingd.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypesd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+ <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -196,15 +202,15 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclient.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommon.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessaging.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+ <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclient.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommon.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessaging.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+ <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -214,7 +220,7 @@
<ClCompile>
<AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -223,22 +229,22 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalOptions> /STACK:10000000 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclient.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommon.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessaging.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+ <AdditionalOptions> /STACK:10000000 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclient.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommon.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessaging.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+ <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
<ClCompile>
<AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -247,15 +253,15 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclient.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommon.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessaging.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+ <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclient.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommon.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessaging.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+ <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
@@ -265,7 +271,7 @@
<ClCompile>
<AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -274,15 +280,15 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalOptions> /STACK:10000000 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclient.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommon.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessaging.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+ <AdditionalOptions> /STACK:10000000 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclient.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommon.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessaging.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+ <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@@ -296,39 +302,39 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\Address.cpp" />
- <ClCompile Include="$(QPID_BUILD_ROOT)\src\windows\generated_src\AssemblyInfo.cpp" />
- <ClCompile Include="..\Connection.cpp" />
- <ClCompile Include="..\FailoverUpdates.cpp" />
- <ClCompile Include="..\Logger.cpp" />
- <ClCompile Include="..\Message.cpp" />
- <ClCompile Include="..\Receiver.cpp" />
- <ClCompile Include="..\Sender.cpp" />
- <ClCompile Include="..\Session.cpp" />
- <ClCompile Include="..\TypeTranslator.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Address.cpp" />
+ <ClCompile Include="${DOTNET_projectBinaryDir}\src\windows\generated_src\AssemblyInfo.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Connection.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\FailoverUpdates.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Logger.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Message.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Receiver.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Sender.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\Session.cpp" />
+ <ClCompile Include="${DOTNET_currentSourceDir}\src\TypeTranslator.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\Address.h" />
- <ClInclude Include="..\Connection.h" />
- <ClInclude Include="..\Duration.h" />
- <ClInclude Include="..\FailoverUpdates.h" />
- <ClInclude Include="..\Logger.h" />
- <ClInclude Include="..\Message.h" />
- <ClInclude Include="..\QpidException.h" />
- <ClInclude Include="..\QpidMarshal.h" />
- <ClInclude Include="..\QpidTypeCheck.h" />
- <ClInclude Include="..\Receiver.h" />
- <ClInclude Include="..\Sender.h" />
- <ClInclude Include="..\Session.h" />
- <ClInclude Include="..\TypeTranslator.h" />
- <ClInclude Include="..\resource1.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Address.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Connection.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Duration.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\FailoverUpdates.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Logger.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Message.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidException.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidMarshal.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidTypeCheck.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Receiver.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Sender.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\Session.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\TypeTranslator.h" />
+ <ClInclude Include="${DOTNET_currentSourceDir}\src\resource1.h" />
</ItemGroup>
<ItemGroup>
- <None Include="..\app.ico" />
- <None Include="..\ReadMe.txt" />
+ <None Include="${DOTNET_currentSourceDir}\src\app.ico" />
+ <None Include="${DOTNET_currentSourceDir}\src\ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="$(QPID_BUILD_ROOT)\src\windows\resources\org.apache.qpid.messaging.rc" />
+ <ResourceCompile Include="${DOTNET_projectBinaryDir}\src\windows\resources\org.apache.qpid.messaging.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc?rev=1624604&r1=1624603&r2=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc Fri Sep 12 18:23:31 2014
@@ -19,7 +19,7 @@
// Microsoft Visual C++ generated resource script.
//
-#include "..\resource1.h"
+#include "${DOTNET_relPathToResource}"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -48,7 +48,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
1 TEXTINCLUDE
BEGIN
- "resource1.h\0"
+ "${DOTNET_relPathToResource}\0"
END
2 TEXTINCLUDE
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org