From f02d00824dd1f5073b0dc1cdfb3b73b16a1a66df Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sun, 17 Jan 2010 20:18:52 +0200
Subject: [PATCH] Installer: Move installer configuration to new file.

---
 win_installer/config.wxi      | 11 +++++++++++
 win_installer/cppcheck.wxs    |  1 +
 win_installer/productInfo.wxi |  8 --------
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 win_installer/config.wxi

diff --git a/win_installer/config.wxi b/win_installer/config.wxi
new file mode 100644
index 000000000..2ad93485d
--- /dev/null
+++ b/win_installer/config.wxi
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <?ifndef Platform ?> <!-- if platform NOT defined -->
+    <?define Platform = "x86" ?>
+  <?endif ?>
+
+  <?define CliBuildDir = "..\cli\release" ?>
+  <?define GuiBuildDir = "..\gui\release" ?>
+  <?define QtDllDir = "..\..\runtimes" ?>
+  <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>
+</Include>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 60d4d356c..4cb86d54e 100755
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <?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'>
 
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 2ddf7a543..f4106ab76 100755
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -8,12 +8,4 @@
   <?define cppcheckGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a48" ?>
   <?define guiGUID = "4102893e-5237-4011-9d70-7d9067623372" ?>
 
-  <?ifndef Platform ?> <!-- if platform NOT defined -->
-    <?define Platform = "x86" ?>
-  <?endif ?>
-
-  <?define CliBuildDir = "..\cli\release" ?>
-  <?define GuiBuildDir = "..\gui\release" ?>
-  <?define QtDllDir = "..\..\runtimes" ?>
-  <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>
 </Include>