[tomboy] [Setup] Improve Tomboy's presentation for Add/Remove programs

[Benjamin Podszun <bpodszun src gnome org>]

commit 8f07f49ab71f095601229e3ab81af81fad5d9977
Author: Benjamin Podszun <benjamin podszun topimagesystems com>
Date:   Thu Aug 5 15:55:39 2010 +0200

    [Setup] Improve Tomboy's presentation for Add/Remove programs
    
    Add the Tomboy icon as program icon to the installer database.
    Add the link to the Tomboy end-user site as help link.
    
    Define the FileVersion for the resulting Tomboy.exe assembly and
    automatically use that version as ProductVersion in the MSI table.
    Drop the AssemblyInformationalVersion and base Defines.VERSION on
    the assembly version again, reducing the number of lines to change
    for a new windows version to exactly one.

 Setup/Setup.wxs         |    7 ++++++-
 Tomboy/Defines.WIN32.cs |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/Setup/Setup.wxs b/Setup/Setup.wxs
index e294398..0799eb4 100644
--- a/Setup/Setup.wxs
+++ b/Setup/Setup.wxs
@@ -3,7 +3,7 @@
 	<Product Id="*"
 		Name="Tomboy Notes"
 		Language="1033"
-		Version="1.3.2.0"
+		Version="!(bind.FileVersion.Tomboy.exe)"
 		UpgradeCode="4401CB77-D6D4-4903-B1F9-41E2F80DF785"
 		Manufacturer="Tomboy Project">
 		<Package Description="Tomboy Notes"
@@ -84,5 +84,10 @@
 		<UIRef Id="WixUI_InstallDir"/>
 
 		<Icon Id="Tomboy.exe" SourceFile="..\bin\Debug\Tomboy.exe" />
+		
+		<!-- Icon for "Add/Remove programs" entry and help link -->
+		<Icon Id="icon.ico" SourceFile="..\data\icons\tomboy.ico" />
+		<Property Id="ARPPRODUCTICON" Value="icon.ico" />
+		<Property Id="ARPHELPLINK" Value="http://projects.gnome.org/tomboy/"; />
 	</Product>
 </Wix>
diff --git a/Tomboy/Defines.WIN32.cs b/Tomboy/Defines.WIN32.cs
index d4bf8d6..06a6282 100644
--- a/Tomboy/Defines.WIN32.cs
+++ b/Tomboy/Defines.WIN32.cs
@@ -2,13 +2,13 @@
 using System.Reflection;
 
 // TODO: Automate this
-[assembly: AssemblyInformationalVersion ("1.3.2")]
+[assembly: AssemblyVersion ("1.3.2")]
 [assembly: AssemblyProduct("Tomboy")]
 [assembly: AssemblyTitle("Tomboy Notes")]
 
 namespace Tomboy {
 	public class Defines {
-		public const string VERSION = "1.3.2";
+		public static readonly string VERSION = Assembly.GetExecutingAssembly().GetName().Version.ToString(3);
 		public static readonly string DATADIR = System.IO.Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
 		public static readonly string GNOME_LOCALE_DIR = System.IO.Path.Combine (DATADIR, "locale");
 		public const string GNOME_HELP_DIR = "@datadir@/gnome/help/tomboy";