From 65e21b844f0dd9eebd00f63bba5d8a6f2e0b5188 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Thu, 24 Jan 2013 00:35:00 +0000
Subject: Obtain ProgramFiles location correctly on 32 and 64 bit systems.
 Fixes QPID-4548

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1437812 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/packaging/windows/qpidc.wxs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'qpid')

diff --git a/qpid/packaging/windows/qpidc.wxs b/qpid/packaging/windows/qpidc.wxs
index 8fd9f9a396..615ee04ed6 100644
--- a/qpid/packaging/windows/qpidc.wxs
+++ b/qpid/packaging/windows/qpidc.wxs
@@ -42,11 +42,18 @@
     <PropertyRef Id="NETFRAMEWORK35"/>
 
     <!-- Allow 64-bit builds to pick ProgramFiles64Folder instead -->
-    <?Define ProgramFiles = "ProgramFilesFolder"?>
+    <?define ProgramFiles = "ProgramFilesFolder"?>
+
+    <!-- Pick up Program Files for 32-bit from the correct place -->
+    <?ifdef env.ProgramFiles(x86)?>
+      <?define ProgramFilesx86 = "$(env.ProgramFiles(x86))"?>
+    <?else?>
+      <?define ProgramFilesx86 = "$(env.ProgramFiles)"?>
+    <?endif?>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Merge Id="VCRedist" SourceFile="C:\Program Files\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm" DiskId="1" Language="0"/>
-      <Merge Id="VCRedistPolicy" SourceFile="C:\Program Files\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm" DiskId="1" Language="0"/>
+      <Merge Id="VCRedist" SourceFile="$(var.ProgramFilesx86)\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm" DiskId="1" Language="0"/>
+      <Merge Id="VCRedistPolicy" SourceFile="$(var.ProgramFilesx86)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm" DiskId="1" Language="0"/>
       <Directory Id="$(var.ProgramFiles)">
         <Directory Id="ApacheTop" Name="Apache">
           <Directory Id="INSTALLLOCATION" Name="qpidc-$(var.qpidc_version)">
@@ -269,7 +276,6 @@
         <ComponentRef Id="TopStorePlugin"/>
         <ComponentRef Id="SQLPersistence"/>
         <ComponentRef Id="CLFSPersistence"/>
-	<ComponentGroupRef Id="group_BoostDlls"/>
       </Feature>
 
       <Feature Id="ClientLib" Title="Client Libraries and Headers to develop and run programs" Level="1">
@@ -293,8 +299,6 @@
         <ComponentRef Id="WCFInteropDLL"/>
         <ComponentRef Id="WCFXADLL"/>
         <ComponentGroupRef Id="group_QpidHeaders"/>
-	<ComponentGroupRef Id="group_BoostHeaders"/>
-        <ComponentGroupRef Id="group_BoostDlls"/>
 
         <Feature Id="Examples" Title="Client Programming Examples" Level="1">
           <ComponentGroupRef Id="group_Examples"/>
-- 
cgit v1.2.1