Followup to handle not installing x64 on x86 systems for Bug 1305453 …

…- Prevent non-esr stand alone installers from installing on XP/Vista. r=mhowell
mozilla-spidermonkey · Nov 21, 2016 · 8ad791d · 8ad791d
1 parent 4395994
commit 8ad791d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
@@ -68,12 +68,12 @@
 #ifdef HAVE_64BIT_BUILD
 !define HAVE_64BIT_BUILD
 !define ARCH "x64"
+!define MinSupportedVer "Microsoft Windows 7 x64"
 #else
+!define MinSupportedVer "Microsoft Windows 7"
 !define ARCH "x86"
 #endif
 
-!define MinSupportedVer "Microsoft Windows 7"
-
 !define MinSupportedCPU "SSE2"
 
 #ifdef MOZ_MAINTENANCE_SERVICE

diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
@@ -1161,6 +1161,11 @@ Function .onInit
   ${EndIf}
 
 !ifdef HAVE_64BIT_BUILD
+  ${Unless} ${RunningX64}
+    MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_OSVER_MSG)" IDCANCEL +2
+    ExecShell "open" "${URLSystemRequirements}"
+    Quit
+  ${EndUnless}
   SetRegView 64
 !endif