diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-05-14 12:25:53 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-05-14 12:25:53 +0000 |
| commit | ffe162a0b5e74993ac83b9cb50746d4474e62c88 (patch) | |
| tree | 208fc3ab0c8b764c0eb7441323cb2f43764f1250 | |
| parent | 3ac50ef9feaec80180131a2a720b3176e0d00ac0 (diff) | |
| download | qpid-python-ffe162a0b5e74993ac83b9cb50746d4474e62c88.tar.gz | |
Merge in version updates; WCF files move from 0.10. NO-JIRA
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1103087 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/packaging/windows/INSTALL_NOTES.html | 6 | ||||
| -rw-r--r-- | qpid/packaging/windows/installer.proj | 21 |
2 files changed, 17 insertions, 10 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..8481c7b8a2 100644 --- a/qpid/packaging/windows/installer.proj +++ b/qpid/packaging/windows/installer.proj @@ -20,7 +20,7 @@ <!--
Packaging script for Apache Qpid on Windows
- Builds the C++ and WCF components, and packages those along with user
+ Builds the C++, .NET, and WCF components, and packages those along with user
documentation and the python pieces needed to generate QMF stuff.
-->
@@ -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.11"
InstallerPlatform="x64"
- OutputFile="qpidc-0.9-x64.msi" />
+ OutputFile="qpidc-0.11-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" />
@@ -229,13 +230,19 @@ <Exec
Command="heat dir $(staging_dir)\bin\boost -var var.boost_dll_dir -dr QpidBin -srd -gg -cg group_BoostDlls -sw5150 -out boost_dlls.wxs" />
<Exec
- Command="heat dir $(staging_dir)\examples -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples.wxs" />
+ Command="heat file $(staging_dir)\examples\README.txt -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_README.wxs" />
+ <Exec
+ Command="heat file $(staging_dir)\examples\examples.sln -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_examples.wxs" />
+ <Exec
+ Command="heat dir $(staging_dir)\examples\messaging -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_messaging.wxs" />
+ <Exec
+ Command="heat dir $(staging_dir)\examples\qmf-console -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_qmf-console.wxs" />
<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.11 -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.11-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples_README.wixobj examples_examples.wixobj examples_messaging.wixobj examples_qmf-console.wixobj api_docs.wixobj" />
</Target>
</Project>
|