Author: shuston
Date: Sat May 14 12:18:36 2011
New Revision: 1103083
URL: http://svn.apache.org/viewvc?rev=1103083&view=rev
Log:
Move WCF artifacts explicitly instead of wildcarding; update version to 0.10
Modified:
qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html
qpid/branches/0.10/qpid/packaging/windows/installer.proj
Modified: qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html
URL:
http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html?rev=1103083&r1=1103082&r2=1103083&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html (original)
+++ qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html Sat May 14
12:18:36 2011
@@ -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>
Modified: qpid/branches/0.10/qpid/packaging/windows/installer.proj
URL:
http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/packaging/windows/installer.proj?rev=1103083&r1=1103082&r2=1103083&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/packaging/windows/installer.proj (original)
+++ qpid/branches/0.10/qpid/packaging/windows/installer.proj Sat May 14
12:18:36 2011
@@ -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>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
