From c1c7521e5b8d10647ac4d2197c6fe845a7df4aee Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Sun, 18 May 2014 08:56:28 -0400 Subject: [PATCH] Port |Bug 1003758 - Error when building Thunderbird/SeaMonkey: FileWriteWord is only available when building a Unicode installer (regression)| for im. rs=bustage-fix --- im/installer/windows/nsis/installer.nsi | 8 ++++++++ im/installer/windows/nsis/uninstaller.nsi | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/im/installer/windows/nsis/installer.nsi b/im/installer/windows/nsis/installer.nsi index b9e023bb17..87c2656d51 100755 --- a/im/installer/windows/nsis/installer.nsi +++ b/im/installer/windows/nsis/installer.nsi @@ -19,6 +19,14 @@ CRCCheck on RequestExecutionLevel user +; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can +; be removed after we require NSIS 3.0a2 or greater. +!ifdef NSIS_PACKEDVERSION + Unicode true + ManifestSupportedOS all + ManifestDPIAware true +!endif + !addplugindir ./ Var TmpVal diff --git a/im/installer/windows/nsis/uninstaller.nsi b/im/installer/windows/nsis/uninstaller.nsi index 5b7b0a97cd..9f52d0558c 100755 --- a/im/installer/windows/nsis/uninstaller.nsi +++ b/im/installer/windows/nsis/uninstaller.nsi @@ -19,6 +19,14 @@ CRCCheck on RequestExecutionLevel user +; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can +; be removed after we require NSIS 3.0a2 or greater. +!ifdef NSIS_PACKEDVERSION + Unicode true + ManifestSupportedOS all + ManifestDPIAware true +!endif + !addplugindir ./ ; On Vista and above attempt to elevate Standard Users in addition to users that