Author: shuston
Date: Tue Sep 11 02:28:31 2012
New Revision: 1383226
URL: http://svn.apache.org/viewvc?rev=1383226&view=rev
Log:
Look for dotnet example files in the correct place for vc9. Fixes QPID-4294
Modified:
qpid/trunk/qpid/packaging/windows/installer.proj (contents, props changed)
Modified: qpid/trunk/qpid/packaging/windows/installer.proj
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=1383226&r1=1383225&r2=1383226&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/installer.proj (original)
+++ qpid/trunk/qpid/packaging/windows/installer.proj Tue Sep 11 02:28:31 2012
@@ -36,7 +36,7 @@
<OutputName>qpidc</OutputName>
<OutputType>Package</OutputType>
<WixToolPath>C:\Program Files (x86)\Windows Installer XML
v3.5\bin</WixToolPath>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == ''
">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == ''
">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\wix.targets</WixTargetsPath>
</PropertyGroup>
<Choose>
@@ -175,10 +175,10 @@
<Target Name="BuildDotNetBindings"><!--
DependsOnTargets="BuildCpp;BuildCppDebug" -->
<MSBuild
-
Projects="$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln"
+
Projects="$(source_root)\cpp\bindings\qpid\dotnet\msvc9\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"
+
Projects="$(source_root)\cpp\bindings\qpid\dotnet\msvc9\org.apache.qpid.messaging.sessionreceiver.sln"
Properties="Configuration=Release;Platform=$(Architecture)" />
</Target>
Propchange: qpid/trunk/qpid/packaging/windows/installer.proj
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Sep 11 02:28:31 2012
@@ -0,0 +1,7 @@
+/qpid/branches/0.10/qpid/packaging/windows/installer.proj:1103083
+/qpid/branches/0.18/qpid/packaging/windows/installer.proj:1383225
+/qpid/branches/0.5.x-dev/qpid/packaging/windows/installer.proj:892761,894875
+/qpid/branches/0.6-release-windows-installer/packaging/windows/installer.proj:926803
+/qpid/branches/0.6-release-windows-installer/qpid/packaging/windows/installer.proj:926865,927233
+/qpid/branches/java-network-refactor/qpid/packaging/windows/installer.proj:805429-825319
+/qpid/branches/qpid-2935/qpid/packaging/windows/installer.proj:1061302-1072333
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
