From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Fri, 26 Nov 2010 07:55:03 +0000 (-0500)
Subject: Windows: NSIS installer requires the architecture for CL=1400
X-Git-Tag: upstream/1.6.0.pre2^2~125
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=48938a5555d7ba7c11b8a77bcd9065c9c9a39c59;p=packages%2Fo%2Fopenafs.git

Windows: NSIS installer requires the architecture for CL=1400

The NSIS installer at present is 32-bit only.  Production releases
of OpenAFS have always been performed using the CL=1310 compiler
so it wasn't noticed that src/WINNT/install/NSIS/NTMakefile did
not define the ARCH (architecture) for the purpose of identifying
which redistributable runtime library installer should be
integrated into the build.  For the CL=1310 compiler there are
not prebuilt installers for OpenAFS to integrate.

Reviewed-on: http://gerrit.openafs.org/3388
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit a2c31a754c2d75dcf6a674f365ad50fc40f595ec)

Change-Id: I38a93f34f3cd8b71ad0f33ca700162d133b11b7a
Reviewed-on: http://gerrit.openafs.org/3780
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index 2b1c12adf..5b134474e 100644
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -53,19 +53,25 @@ $(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res
 !IF ("$(AFSDEV_BUILDTYPE)"=="FREE")
 !IF ("$(CPU)" == "i386")
 MSI_PLATFORM=Intel
+ARCH=x86
 !ELSE IF ("$(CPU)" == "amd64")
 MSI_PLATFORM=x64
+ARCH=x64
 !ELSE
 MSI_PLATFORM=$(CPU)
+ARCH=$(CPU)
 !ENDIF
 MSI_CONFIG=Retail
 !ELSE
 !IF ("$(CPU)" == "i386")
 MSI_PLATFORM=Intel
+ARCH=x86
 !ELSE IF ("$(CPU)" == "amd64")
 MSI_PLATFORM=x64
+ARCH=x64
 !ELSE
 MSI_PLATFORM=$(CPU)
+ARCH=$(CPU)
 !ENDIF
 MSI_CONFIG=Debug
 !ENDIF