diff options
Diffstat (limited to 'qpid/packaging/windows/installer.proj')
| -rw-r--r-- | qpid/packaging/windows/installer.proj | 51 |
1 files changed, 45 insertions, 6 deletions
diff --git a/qpid/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj index de68b05626..7be5fda472 100644 --- a/qpid/packaging/windows/installer.proj +++ b/qpid/packaging/windows/installer.proj @@ -45,6 +45,7 @@ <CmakeGenerator>%22Visual Studio 9 2008 Win64%22</CmakeGenerator>
<Architecture>x64</Architecture>
<CSProjArchitecture>x64</CSProjArchitecture>
+ <DotNetBindingsArchitecture>x64</DotNetBindingsArchitecture>
</PropertyGroup>
</When>
<Otherwise>
@@ -53,23 +54,32 @@ <CmakeGenerator>%22Visual Studio 9 2008%22</CmakeGenerator>
<Architecture>x86</Architecture>
<CSProjArchitecture>Win32</CSProjArchitecture>
+ <DotNetBindingsArchitecture>Win32</DotNetBindingsArchitecture>
</PropertyGroup>
</Otherwise>
</Choose>
<ItemGroup>
+ <CppDebugProjects Include="$(build_dir)\src\qpidtypes.vcproj"/>
<CppDebugProjects Include="$(build_dir)\src\qpidcommon.vcproj"/>
<CppDebugProjects Include="$(build_dir)\src\qpidclient.vcproj"/>
+ <CppDebugProjects Include="$(build_dir)\src\qpidmessaging.vcproj"/>
<CppDebugProjects Include="$(build_dir)\src\qmfconsole.vcproj"/>
</ItemGroup>
<ItemGroup>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidtypesd.dll"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidtypesd.lib"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidtypesd.pdb"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.dll"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.lib"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.pdb"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.dll"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.lib"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.pdb"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidmessagingd.dll"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidmessagingd.lib"/>
+ <CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidmessagingd.pdb"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.dll"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.lib"/>
<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.pdb"/>
@@ -83,6 +93,20 @@ </ItemGroup>
<ItemGroup>
+ <DotNetBindingArtifacts Include="$(build_dir)\src\Release\org.apache.qpid.messaging.dll"/>
+ <DotNetBindingArtifacts Include="$(build_dir)\src\Release\org.apache.qpid.messaging.pdb"/>
+ <DotNetBindingArtifacts Include="$(build_dir)\src\Release\org.apache.qpid.messaging.sessionreceiver.dll"/>
+ <DotNetBindingArtifacts Include="$(build_dir)\src\Release\org.apache.qpid.messaging.sessionreceiver.pdb"/>
+ </ItemGroup>
+
+ <ItemGroup>
+ <DotNetBindingDebugArtifacts Include="$(build_dir)\src\Debug\org.apache.qpid.messaging.dll"/>
+ <DotNetBindingDebugArtifacts Include="$(build_dir)\src\Debug\org.apache.qpid.messaging.pdb"/>
+ <DotNetBindingDebugArtifacts Include="$(build_dir)\src\Debug\org.apache.qpid.messaging.sessionreceiver.dll"/>
+ <DotNetBindingDebugArtifacts Include="$(build_dir)\src\Debug\org.apache.qpid.messaging.sessionreceiver.pdb"/>
+ </ItemGroup>
+
+ <ItemGroup>
<BoostDlls Include="$(staging_dir)\bin\boost_*.dll"/>
</ItemGroup>
@@ -142,13 +166,22 @@ <Target Name="BuildDocs" DependsOnTargets="Configure">
<VCBuild
- Projects="$(build_dir)\docs\api\user-api-docs.vcproj"
+ Projects="$(build_dir)\docs\api\docs-user-api.vcproj"
SolutionFile="$(build_dir)/qpid-cpp.sln"
Configuration="Release" />
</Target>
+ <Target Name="BuildDotNetBindings"><!-- DependsOnTargets="BuildCpp;BuildCppDebug" -->
+ <MSBuild
+ Projects="$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln"
+ Properties="Configuration=Debug;Platform=$(Architecture)" />
+ <MSBuild
+ Projects="$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln"
+ Properties="Configuration=Release;Platform=$(Architecture)" />
+ </Target>
+
<Target Name="Stage"
- DependsOnTargets="BuildCpp;BuildCppDebug;BuildWcf;BuildDocs">
+ DependsOnTargets="BuildCpp;BuildCppDebug;BuildWcf;BuildDocs;BuildDotNetBindings">
<Exec
Command="cmake -DCMAKE_INSTALL_CONFIG_NAME=%22Release%22 -P $(build_dir)\cmake_install.cmake" />
<Copy
@@ -160,6 +193,12 @@ <Copy
SourceFiles="@(WcfExamples)"
DestinationFiles="@(WcfExamples->'$(staging_dir)\examples\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy
+ SourceFiles="@(DotNetBindingArtifacts)"
+ DestinationFolder="$(staging_dir)\bin" />
+ <Copy
+ SourceFiles="@(DotNetBindingDebugArtifacts)"
+ DestinationFolder="$(staging_dir)\bin\Debug" />
</Target>
<Target Name="Installer" DependsOnTargets="Stage">
@@ -178,9 +217,9 @@ OutputFile="boost_dlls.wxs" />
<Candle
ToolPath="$(WixToolPath)"
- DefineConstants="qpidc_version=0.6"
+ DefineConstants="qpidc_version=0.9"
InstallerPlatform="x64"
- OutputFile="qpidc-0.6-x64.msi" />
+ OutputFile="qpidc-0.9-x64.msi" />
-->
<Exec
Command="heat dir $(staging_dir)\include\qpid -var var.qpid_headers_dir -dr QpidInclude -gg -cg group_QpidHeaders -out qpid_headers.wxs" />
@@ -194,9 +233,9 @@ <Exec
Command="heat dir $(staging_dir)\docs\api -var var.api_docs_dir -dr QpidDoc -gg -cg group_APIDocs -out api_docs.wxs" />
<Exec
- Command="candle -dqpidc_version=0.6 -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost -dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch $(Architecture)" />
+ Command="candle -dqpidc_version=0.9 -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost -dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch $(Architecture)" />
<Exec
- Command="light -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-0.6-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj api_docs.wixobj" />
+ Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-0.9-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj api_docs.wixobj" />
</Target>
</Project>
|