diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-05-14 12:18:36 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-05-14 12:18:36 +0000 |
| commit | d4bbfb9d295418dce2be4f06c0672af104dd29a8 (patch) | |
| tree | 918518629b6808cacead46c6f5f5cdc7af65e55c | |
| parent | ffc032fff98008ac58413c9af696cea089a1f01c (diff) | |
| download | qpid-python-d4bbfb9d295418dce2be4f06c0672af104dd29a8.tar.gz | |
Move WCF artifacts explicitly instead of wildcarding; update version to 0.10
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.10@1103083 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/packaging/windows/INSTALL_NOTES.html | 6 | ||||
| -rw-r--r-- | qpid/packaging/windows/installer.proj | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/qpid/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html index 4aecce697a..f8e109cb36 100644 --- a/qpid/packaging/windows/INSTALL_NOTES.html +++ b/qpid/packaging/windows/INSTALL_NOTES.html @@ -1,11 +1,11 @@ <html>
<head>
-<title>Apache Qpid C++ 0.9 Installation Notes</title>
+<title>Apache Qpid C++ 0.10 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.9 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.10 Installation Notes</H1>
-<p>Thank you for installing Apache Qpid version 0.9 for Windows.
+<p>Thank you for installing Apache Qpid version 0.10 for Windows.
If the requisite features were installed, you can now run a broker,
use the example programs, and design your own messaging programs while
reading the Qpid C++ API reference documentation.</p>
diff --git a/qpid/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj index 7be5fda472..5201d6a5a7 100644 --- a/qpid/packaging/windows/installer.proj +++ b/qpid/packaging/windows/installer.proj @@ -87,7 +87,8 @@ <ItemGroup>
<WcfProjects Include="$(source_root)\wcf\src\Apache\Qpid\**\*.csproj"/>
- <WcfArtifacts Include="$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\*.dll"/>
+ <WcfArtifacts Include="$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\Apache.Qpid.Channel.dll"/>
+ <WcfArtifacts Include="$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\Apache.Qpid.Interop.dll"/>
<WcfExamples Include="$(source_root)\wcf\samples\**\*"
Exclude="$(source_root)\wcf\samples\**\.svn\**"/>
</ItemGroup>
@@ -217,9 +218,9 @@ OutputFile="boost_dlls.wxs" />
<Candle
ToolPath="$(WixToolPath)"
- DefineConstants="qpidc_version=0.9"
+ DefineConstants="qpidc_version=0.10"
InstallerPlatform="x64"
- OutputFile="qpidc-0.9-x64.msi" />
+ OutputFile="qpidc-0.10-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" />
@@ -233,9 +234,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.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)" />
+ Command="candle -dqpidc_version=0.10 -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 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" />
+ Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-0.10-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj api_docs.wixobj" />
</Target>
</Project>
|