From 636bcd8a47d8de132e5d74fe17d9326a0f117b02 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Mon, 15 Mar 2010 20:10:42 +0200
Subject: [PATCH] Installer: Move couple of strings to productInfo.wxi.

---
 win_installer/cppcheck.wxs    | 4 ++--
 win_installer/productInfo.wxi | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 20c46bb2f..f3a06fcb6 100755
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -3,10 +3,10 @@
   <?include productInfo.wxi ?>
   <?include config.wxi ?>
   <Product Name='$(var.ProductName)' Id='*' UpgradeCode='$(var.ProductUpgradeCode)'
-    Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='The Cppcheck team'>
+    Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='$(var.ProductManufacturer)'>
 
     <Package Id='*' Keywords='Installer' Description="$(var.ProductName) Setup"
-      Comments='Cppcheck is a tool for static analysis of C/C++ code' Manufacturer='The Cppcheck team'
+      Comments='$(var.ProductDescription)' Manufacturer='$(var.ProductManufacturer)'
       InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252'/>
 
     <Media Id='1' Cabinet='Cppcheck.cab' EmbedCab='yes' DiskPrompt='CD-ROM 1' />
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 36237912c..6947f82d1 100755
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -3,9 +3,12 @@
   <?define ProductName = "Cppcheck 1.42" ?>
   <?define ProductNameShort = "Cppcheck" ?>
   <?define ProductVersion = "1.42.0" ?>
+
+  <?define ProductManufacturer = "The Cppcheck team" ?>
+  <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>
+
   <?define ProductGUID = "{7214EC4C-8F10-4E56-8E99-0B9908E68774}" ?>
   <?define ProductUpgradeCode = "{7E94124C-1CD1-433F-9423-4614E52300DD}" ?>
   <?define cppcheckGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a48" ?>
   <?define guiGUID = "4102893e-5237-4011-9d70-7d9067623372" ?>
-
 </Include>