From: Tim Gerundt <tim@gerundt.de>
Date: Wed, 27 May 2009 19:27:50 +0000 (+0000)
Subject: PATCH: [ 2690509 ] Installer: First MSI setup - Add product version to filename if... 
X-Git-Tag: 2.16.5~2284
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0bdb2009b435282f4fce3e9d82cb4c077715a9a0;p=winmerge-jp%2Fwinmerge-jp.git

PATCH: [ 2690509 ] Installer: First MSI setup - Add product version to filename if possible
---

diff --git a/Installer/WiX/WinMerge.wixproj b/Installer/WiX/WinMerge.wixproj
index ce54cf440..652f60d46 100644
--- a/Installer/WiX/WinMerge.wixproj
+++ b/Installer/WiX/WinMerge.wixproj
@@ -8,7 +8,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     
-    <OutputName>WinMerge-$(Platform)-Setup</OutputName>
+    <OutputName Condition=" '$(ProductVersion)' != '' ">WinMerge-$(ProductVersion)-$(Platform)-Setup</OutputName>
+    <OutputName Condition=" '$(ProductVersion)' == '' ">WinMerge-$(Platform)-Setup</OutputName>
     <OutputPath>..\..\Build\WiX\$(Configuration)\$(Platform)\</OutputPath>
     <IntermediateOutputPath>..\..\BuildTmp\WiX\$(Configuration)\$(Platform)\</IntermediateOutputPath>
     <OutputType>package</OutputType>