Bug 392303 - Simplify installer changes (fix includes for older versions of NSIS). r=sspitzer

This commit is contained in:
rob_strong@exchangecode.com 2007-08-23 12:39:50 -07:00
parent 8c85fa29c5
commit e9cc59ab10
2 changed files with 18 additions and 10 deletions

View File

@ -67,11 +67,15 @@ Exch 1 ; exchange the top of the stack with 2 below the top of the stack
Exch $R9 ; exchange the new $R9 value with the top of the stack
*/
# Commented out until the Thunderbird, Seamonkey, and Calendar Tinderboxes
# have been updated to MozillaBuild which includes an updated version of
# NSIS
# !include TextFunc.nsh
# !include FileFunc.nsh
; When including a file provided by NSIS check if its verbose macro is defined
; to prevent loading the file a second time.
!ifmacrondef TEXTFUNC_VERBOSE
!include TextFunc.nsh
!endif
!ifmacrondef FILEFUNC_VERBOSE
!include FileFunc.nsh
!endif
; NSIS provided macros that we have overridden.
!include overrides.nsh

View File

@ -4,11 +4,15 @@
!ifndef OVERRIDES_INCLUDED
!define OVERRIDES_INCLUDED
# Commented out until the Thunderbird, Seamonkey, and Calendar Tinderboxes
# have been updated to MozillaBuild which includes an updated version of
# NSIS
# !include TextFunc.nsh
# !include FileFunc.nsh
; When including a file check if its verbose macro is defined to prevent
; loading the file a second time.
!ifmacrondef TEXTFUNC_VERBOSE
!include TextFunc.nsh
!endif
!ifmacrondef FILEFUNC_VERBOSE
!include FileFunc.nsh
!endif
; Modified version of Locate from the NSIS File Functions Header v3.2
; This version has the calls to SetDetailsPrint and DetailsPrint commented out.