From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 25 Jul 2008 20:45:32 +0000 (+0000)
Subject: DEVEL15-windows-nsis-vc-runtime-install-20080725
X-Git-Tag: openafs-devel-1_5_51~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=54d2c6fda8fafad5db0d45e0fef6b38d8ff06f7c;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-nsis-vc-runtime-install-20080725

LICENSE MIT

The NSIS installer was building a msi for the vc runtime that included
the Debug merge modules when the Retail merge modules should have been
used instead.


(cherry picked from commit ba846eb82994469b904c104d52369fb55b985a20)
---

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index 774083291..8e1e1132a 100644
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -47,20 +47,22 @@ $(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res
 
 !IF ("$(AFSDEV_BUILDTYPE)"=="FREE")
 !IF ("$(CPU)" == "i386")
-ARCH=x86
+MSI_PLATFORM=Intel
 !ELSE IF ("$(CPU)" == "amd64")
-ARCH=x64
+MSI_PLATFORM=x64
 !ELSE
-ARCH=$(CPU)
+MSI_PLATFORM=$(CPU)
 !ENDIF
+MSI_CONFIG=Retail
 !ELSE
 !IF ("$(CPU)" == "i386")
-ARCH=Intel
+MSI_PLATFORM=Intel
 !ELSE IF ("$(CPU)" == "amd64")
-ARCH=x64
+MSI_PLATFORM=x64
 !ELSE
-ARCH=$(CPU)
+MSI_PLATFORM=$(CPU)
 !ENDIF
+MSI_CONFIG=Debug
 !ENDIF
 
 !IF ("$(CPU)" == "i386")
@@ -79,7 +81,7 @@ $(MSVCMSI): $(OUT)\vcruntime.wixobj
 	$(CODESIGN_USERLAND)
 
 $(OUT)\vcruntime.wixobj: vcruntime.wxs
-	candle -out $@ $** -dPlatform=$(ARCH) -dConfig=Debug -dVCVer=$(AFSVER_CL)
+	candle -out $@ $** -dPlatform=$(MSI_PLATFORM) -dConfig=$(MSI_CONFIG) -dVCVer=$(AFSVER_CL)
 
 !else
 MSVCMSI=