338901 - Better progress messages

Status: RESOLVED FIXED

(Firefox :: Installer, defect)

Description

[Robert Strong (they/them - no direct email)]

The progress messages need to be improved with the NSIS installer. One example is when parsing text files (e.g. old log files) it shows line number in the file that is being parsed, etc.

Comment 1

[Mike Beltzner [:beltzner, not reading bugmail]]

Rob, can you point me to the list of strings so I can provide better ones?

Comment 2

[Robert Strong (they/them - no direct email)]

We shouldn't have to change strings for this unless we want to. Currently the messages are for the individual files being installed and at the end it goes through the previous uninstall.log to combine the diff's from the previous install with this install. When these messages are displayed the line number and result from the file it is comparing is being read in and I could just have it display Finishing Install or something to that affect.

Alternatively, we could display something along the lines of "Installing Firefox..." for the main files, "Installing Language en-US...", and "Installing Quality Feedback Agent..." which is similar to what we are doing now. This would require new strings though.

Comment 3

[Robert Strong (they/them - no direct email)]

Attachment: patch

There are two macros that are provided by NSIS and used by the installer that print progress messages. I know of no way to override these macros so I made new versions of them that don't print these messages. I created a new file for them since they may need to be updated when a newer version of NSIS is used.

beltzner, besides the strings we discuss I also had to add an Uninstalling brandShortName...

Comment 4

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 227525 [details] [diff] [review]
patch

Assuming this implements the strings we talked about and the one that you mention in your comment, I'm cool with this.

Comment 5

[Robert Strong (they/them - no direct email)]

Comment on attachment 227525 [details] [diff] [review]
patch

>Index: toolkit/mozapps/installer/windows/nsis/overrides.nsh
>===================================================================
>RCS file: toolkit/mozapps/installer/windows/nsis/overrides.nsh
>diff -N toolkit/mozapps/installer/windows/nsis/overrides.nsh
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ toolkit/mozapps/installer/windows/nsis/overrides.nsh	29 Jun 2006 11:33:52 -0000
>@@ -0,0 +1,568 @@
>+################################################################################
>+# Modified versions of macros provided by NSIS
>+
>+; Modified version of Locate from the NSIS File Functions Header v3.2
>+; This version has the calls to SetDetailsPrint and DetailsPrint commented out.
>+; See <NSIS App Dir>/include/FileFunc.nsh for more information
>+!macro LocateNoDetails
>+  !ifndef ${_FILEFUNC_UN}LocateNoDetails
>+    !verbose push
>+    !verbose ${_FILEFUNC_VERBOSE}
>+    !define ${_FILEFUNC_UN}LocateNoDetails `!insertmacro ${_FILEFUNC_UN}LocateNoDetailsCall`
>+
>+    Function ${_FILEFUNC_UN}LocateNoDetails
>+      Exch $2
>+      Exch
>+      Exch $1
>+      Exch
>+      Exch 2
>+      Exch $0
>+      Exch 2
>+      Push $3
>+      Push $4
>+      Push $5
>+      Push $6
>+      Push $7
>+      Push $8
>+      Push $9
>+      Push $R6
>+      Push $R7
>+      Push $R8
>+      Push $R9
>+      ClearErrors
>+
>+      StrCpy $3 ''
>+      StrCpy $4 ''
>+      StrCpy $5 ''
>+      StrCpy $6 ''
>+      StrCpy $7 ''
>+      StrCpy $8 0
>+      StrCpy $R7 ''
>+
>+      StrCpy $R9 $0 1 -1
>+      StrCmp $R9 '\' 0 +3
>+      StrCpy $0 $0 -1
>+      goto -3
>+      IfFileExists '$0\*.*' 0 error
>+
>+      option:
>+      StrCpy $R9 $1 1
>+      StrCpy $1 $1 '' 1
>+      StrCmp $R9 ' ' -2
>+      StrCmp $R9 '' sizeset
>+      StrCmp $R9 '/' 0 -4
>+      StrCpy $9 -1
>+      IntOp $9 $9 + 1
>+      StrCpy $R9 $1 1 $9
>+      StrCmp $R9 '' +2
>+      StrCmp $R9 '/' 0 -3
>+      StrCpy $R8 $1 $9
>+      StrCpy $R8 $R8 '' 2
>+      StrCpy $R9 $R8 '' -1
>+      StrCmp $R9 ' ' 0 +3
>+      StrCpy $R8 $R8 -1
>+      goto -3
>+      StrCpy $R9 $1 2
>+      StrCpy $1 $1 '' $9
>+
>+      StrCmp $R9 'L=' 0 mask
>+      StrCpy $3 $R8
>+      StrCmp $3 '' +6
>+      StrCmp $3 'FD' +5
>+      StrCmp $3 'F' +4
>+      StrCmp $3 'D' +3
>+      StrCmp $3 'DE' +2
>+      StrCmp $3 'FDE' 0 error
>+      goto option
>+
>+      mask:
>+      StrCmp $R9 'M=' 0 size
>+      StrCpy $4 $R8
>+      goto option
>+
>+      size:
>+      StrCmp $R9 'S=' 0 gotosubdir
>+      StrCpy $6 $R8
>+      goto option
>+
>+      gotosubdir:
>+      StrCmp $R9 'G=' 0 banner
>+      StrCpy $7 $R8
>+      StrCmp $7 '' +3
>+      StrCmp $7 '1' +2
>+      StrCmp $7 '0' 0 error
>+      goto option
>+
>+      banner:
>+      StrCmp $R9 'B=' 0 error
>+      StrCpy $R7 $R8
>+      StrCmp $R7 '' +3
>+      StrCmp $R7 '1' +2
>+      StrCmp $R7 '0' 0 error
>+      goto option
>+
>+      sizeset:
>+      StrCmp $6 '' default
>+      StrCpy $9 0
>+      StrCpy $R9 $6 1 $9
>+      StrCmp $R9 '' +4
>+      StrCmp $R9 ':' +3
>+      IntOp $9 $9 + 1
>+      goto -4
>+      StrCpy $5 $6 $9
>+      IntOp $9 $9 + 1
>+      StrCpy $1 $6 1 -1
>+      StrCpy $6 $6 -1 $9
>+      StrCmp $5 '' +2
>+      IntOp $5 $5 + 0
>+      StrCmp $6 '' +2
>+      IntOp $6 $6 + 0
>+
>+      StrCmp $1 'B' 0 +3
>+      StrCpy $1 1
>+      goto default
>+      StrCmp $1 'K' 0 +3
>+      StrCpy $1 1024
>+      goto default
>+      StrCmp $1 'M' 0 +3
>+      StrCpy $1 1048576
>+      goto default
>+      StrCmp $1 'G' 0 error
>+      StrCpy $1 1073741824
>+
>+      default:
>+      StrCmp $3 '' 0 +2
>+      StrCpy $3 'FD'
>+      StrCmp $4 '' 0 +2
>+      StrCpy $4 '*.*'
>+      StrCmp $7 '' 0 +2
>+      StrCpy $7 '1'
>+      StrCmp $R7 '' 0 +2
>+      StrCpy $R7 '0'
>+      StrCpy $7 'G$7B$R7'
>+
>+      StrCpy $8 1
>+      Push $0
>+;      SetDetailsPrint textonly
>+
>+      nextdir:
>+      IntOp $8 $8 - 1
>+      Pop $R8
>+
>+      StrCpy $9 $7 2 2
>+      StrCmp $9 'B0' +3
>+      GetLabelAddress $9 findfirst
>+      goto call
>+;      DetailPrint 'Search in: $R8'
>+
>+      findfirst:
>+      FindFirst $0 $R7 '$R8\$4'
>+      IfErrors subdir
>+      StrCmp $R7 '.' 0 +5
>+      FindNext $0 $R7
>+      StrCmp $R7 '..' 0 +3
>+      FindNext $0 $R7
>+      IfErrors subdir
>+
>+      dir:
>+      IfFileExists '$R8\$R7\*.*' 0 file
>+      StrCpy $R6 ''
>+      StrCmp $3 'DE' +4
>+      StrCmp $3 'FDE' +3
>+      StrCmp $3 'FD' precall
>+      StrCmp $3 'F' findnext precall
>+      FindFirst $9 $R9 '$R8\$R7\*.*'
>+      StrCmp $R9 '.' 0 +4
>+      FindNext $9 $R9
>+      StrCmp $R9 '..' 0 +2
>+      FindNext $9 $R9
>+      FindClose $9
>+      IfErrors precall findnext
>+
>+      file:
>+      StrCmp $3 'FDE' +3
>+      StrCmp $3 'FD' +2
>+      StrCmp $3 'F' 0 findnext
>+      StrCpy $R6 0
>+      StrCmp $5$6 '' precall
>+      FileOpen $9 '$R8\$R7' r
>+      IfErrors +3
>+      FileSeek $9 0 END $R6
>+      FileClose $9
>+      System::Int64Op $R6 / $1
>+      Pop $R6
>+      StrCmp $5 '' +2
>+      IntCmp $R6 $5 0 findnext
>+      StrCmp $6 '' +2
>+      IntCmp $R6 $6 0 0 findnext
>+
>+      precall:
>+      StrCpy $9 0
>+      StrCpy $R9 '$R8\$R7'
>+
>+      call:
>+      Push $0
>+      Push $1
>+      Push $2
>+      Push $3
>+      Push $4
>+      Push $5
>+      Push $6
>+      Push $7
>+      Push $8
>+      Push $9
>+      Push $R7
>+      Push $R8
>+      StrCmp $9 0 +4
>+      StrCpy $R6 ''
>+      StrCpy $R7 ''
>+      StrCpy $R9 ''
>+      Call $2
>+      Pop $R9
>+      Pop $R8
>+      Pop $R7
>+      Pop $9
>+      Pop $8
>+      Pop $7
>+      Pop $6
>+      Pop $5
>+      Pop $4
>+      Pop $3
>+      Pop $2
>+      Pop $1
>+      Pop $0
>+      IfErrors error
>+
>+      StrCmp $R9 'StopLocate' clearstack
>+      goto $9
>+
>+      findnext:
>+      FindNext $0 $R7
>+      IfErrors 0 dir
>+      FindClose $0
>+
>+      subdir:
>+      StrCpy $9 $7 2
>+      StrCmp $9 'G0' end
>+      FindFirst $0 $R7 '$R8\*.*'
>+      StrCmp $R7 '.' 0 +5
>+      FindNext $0 $R7
>+      StrCmp $R7 '..' 0 +3
>+      FindNext $0 $R7
>+      IfErrors +7
>+
>+      IfFileExists '$R8\$R7\*.*' 0 +3
>+      Push '$R8\$R7'
>+      IntOp $8 $8 + 1
>+      FindNext $0 $R7
>+      IfErrors 0 -4
>+      FindClose $0
>+      StrCmp $8 0 end nextdir
>+
>+      error:
>+      SetErrors
>+
>+      clearstack:
>+      StrCmp $8 0 end
>+      IntOp $8 $8 - 1
>+      Pop $R8
>+      goto clearstack
>+
>+      end:
>+;      SetDetailsPrint both
>+      Pop $R9
>+      Pop $R8
>+      Pop $R7
>+      Pop $R6
>+      Pop $9
>+      Pop $8
>+      Pop $7
>+      Pop $6
>+      Pop $5
>+      Pop $4
>+      Pop $3
>+      Pop $2
>+      Pop $1
>+      Pop $0
>+    FunctionEnd
>+
>+    !verbose pop
>+  !endif
>+!macroend
>+
>+!macro LocateNoDetailsCall _PATH _OPTIONS _FUNC
>+  !verbose push
>+  !verbose ${_FILEFUNC_VERBOSE}
>+  Push $0
>+  Push `${_PATH}`
>+  Push `${_OPTIONS}`
>+  GetFunctionAddress $0 `${_FUNC}`
>+  Push `$0`
>+  Call LocateNoDetails
>+  Pop $0
>+  !verbose pop
>+!macroend
>+
>+!macro un.LocateNoDetailsCall _PATH _OPTIONS _FUNC
>+  !verbose push
>+  !verbose ${_FILEFUNC_VERBOSE}
>+  Push $0
>+  Push `${_PATH}`
>+  Push `${_OPTIONS}`
>+  GetFunctionAddress $0 `${_FUNC}`
>+  Push `$0`
>+  Call un.LocateNoDetails
>+  Pop $0
>+  !verbose pop
>+!macroend
>+
>+!macro un.LocateNoDetails
>+  !ifndef un.LocateNoDetails
>+    !verbose push
>+    !verbose ${_FILEFUNC_VERBOSE}
>+    !undef _FILEFUNC_UN
>+    !define _FILEFUNC_UN `un.`
>+
>+    !insertmacro LocateNoDetails
>+
>+    !undef _FILEFUNC_UN
>+    !define _FILEFUNC_UN
>+    !verbose pop
>+  !endif
>+!macroend
>+
>+; Modified version of TextCompare from the NSIS Text Functions Header v2.4
>+; This version has the calls to SetDetailsPrint and DetailsPrint commented out.
>+; See <NSIS App Dir>/include/TextFunc.nsh for more information
>+!macro TextCompareNoDetails
>+  !ifndef ${_TEXTFUNC_UN}TextCompareNoDetails${_TEXTFUNC_S}
>+    !verbose push
>+    !verbose ${_TEXTFUNC_VERBOSE}
>+    !define ${_TEXTFUNC_UN}TextCompareNoDetails${_TEXTFUNC_S} `!insertmacro ${_TEXTFUNC_UN}TextCompareNoDetails${_TEXTFUNC_S}Call`
>+
>+    Function ${_TEXTFUNC_UN}TextCompareNoDetails${_TEXTFUNC_S}
>+      Exch $3
>+      Exch
>+      Exch $2
>+      Exch
>+      Exch 2
>+      Exch $1
>+      Exch 2
>+      Exch 3
>+      Exch $0
>+      Exch 3
>+      Push $4
>+      Push $5
>+      Push $6
>+      Push $7
>+      Push $8
>+      Push $9
>+      ClearErrors
>+
>+      IfFileExists $0 0 error
>+      IfFileExists $1 0 error
>+      StrCmp $2 'FastDiff' +5
>+      StrCmp $2 'FastEqual' +4
>+      StrCmp $2 'SlowDiff' +3
>+      StrCmp $2 'SlowEqual' +2
>+      goto error
>+
>+      FileOpen $4 $0 r
>+      IfErrors error
>+      FileOpen $5 $1 r
>+      IfErrors error
>+;      SetDetailsPrint textonly
>+
>+      StrCpy $6 0
>+      StrCpy $8 0
>+
>+      nextline:
>+      StrCmp${_TEXTFUNC_S} $4 '' fast
>+      IntOp $8 $8 + 1
>+      FileRead $4 $9
>+      IfErrors 0 +4
>+      FileClose $4
>+      StrCpy $4 ''
>+      StrCmp${_TEXTFUNC_S} $5 '' end
>+      StrCmp $2 'FastDiff' fast
>+      StrCmp $2 'FastEqual' fast slow
>+
>+      fast:
>+      StrCmp${_TEXTFUNC_S} $5 '' call
>+      IntOp $6 $6 + 1
>+      FileRead $5 $7
>+      IfErrors 0 +5
>+      FileClose $5
>+      StrCpy $5 ''
>+      StrCmp${_TEXTFUNC_S} $4 '' end
>+      StrCmp $2 'FastDiff' call close
>+      StrCmp $2 'FastDiff' 0 +2
>+      StrCmp${_TEXTFUNC_S} $7 $9 nextline call
>+      StrCmp${_TEXTFUNC_S} $7 $9 call nextline
>+
>+      slow:
>+      StrCmp${_TEXTFUNC_S} $4 '' close
>+      StrCpy $6 ''
>+;      DetailPrint '$8. $9'
>+      FileSeek $5 0
>+
>+      slownext:
>+      FileRead $5 $7
>+      IfErrors 0 +2
>+      StrCmp $2 'SlowDiff' call nextline
>+      StrCmp $2 'SlowDiff' 0 +2
>+      StrCmp${_TEXTFUNC_S} $7 $9 nextline slownext
>+      IntOp $6 $6 + 1
>+      StrCmp${_TEXTFUNC_S} $7 $9 0 slownext
>+
>+      call:
>+      Push $2
>+      Push $3
>+      Push $4
>+      Push $5
>+      Push $6
>+      Push $7
>+      Push $8
>+      Push $9
>+      Call $3
>+      Pop $0
>+      Pop $9
>+      Pop $8
>+      Pop $7
>+      Pop $6
>+      Pop $5
>+      Pop $4
>+      Pop $3
>+      Pop $2
>+      StrCmp $0 'StopTextCompare' 0 nextline
>+
>+      close:
>+      FileClose $4
>+      FileClose $5
>+      goto end
>+
>+      error:
>+      SetErrors
>+
>+      end:
>+;      SetDetailsPrint both
>+      Pop $9
>+      Pop $8
>+      Pop $7
>+      Pop $6
>+      Pop $5
>+      Pop $4
>+      Pop $3
>+      Pop $2
>+      Pop $1
>+      Pop $0
>+    FunctionEnd
>+
>+    !verbose pop
>+  !endif
>+!macroend
>+
>+!macro TextCompareNoDetailsS
>+  !ifndef TextCompareNoDetailsS
>+    !verbose push
>+    !verbose ${_TEXTFUNC_VERBOSE}
>+    !undef _TEXTFUNC_S
>+    !define _TEXTFUNC_S `S`
>+
>+    !insertmacro TextCompareNoDetails
>+
>+    !undef _TEXTFUNC_S
>+    !define _TEXTFUNC_S
>+    !verbose pop
>+  !endif
>+!macroend
>+
>+!macro TextCompareNoDetailsCall _FILE1 _FILE2 _OPTION _FUNC
>+  !verbose push
>+  !verbose ${_TEXTFUNC_VERBOSE}
>+  Push $0
>+  Push `${_FILE1}`
>+  Push `${_FILE2}`
>+  Push `${_OPTION}`
>+  GetFunctionAddress $0 `${_FUNC}`
>+  Push `$0`
>+  Call TextCompareNoDetails
>+  Pop $0
>+  !verbose pop
>+!macroend
>+
>+!macro TextCompareNoDetailsSCall _FILE1 _FILE2 _OPTION _FUNC
>+  !verbose push
>+  !verbose ${_TEXTFUNC_VERBOSE}
>+  Push $0
>+  Push `${_FILE1}`
>+  Push `${_FILE2}`
>+  Push `${_OPTION}`
>+  GetFunctionAddress $0 `${_FUNC}`
>+  Push `$0`
>+  Call TextCompareNoDetailsS
>+  Pop $0
>+  !verbose pop
>+!macroend
>+
>+!macro un.TextCompareNoDetailsCall _FILE1 _FILE2 _OPTION _FUNC
>+  !verbose push
>+  !verbose ${_TEXTFUNC_VERBOSE}
>+  Push $0
>+  Push `${_FILE1}`
>+  Push `${_FILE2}`
>+  Push `${_OPTION}`
>+  GetFunctionAddress $0 `${_FUNC}`
>+  Push `$0`
>+  Call un.TextCompareNoDetails
>+  Pop $0
>+  !verbose pop
>+!macroend
>+
>+!macro un.TextCompareNoDetailsSCall _FILE1 _FILE2 _OPTION _FUNC
>+  !verbose push
>+  !verbose ${_TEXTFUNC_VERBOSE}
>+  Push $0
>+  Push `${_FILE1}`
>+  Push `${_FILE2}`
>+  Push `${_OPTION}`
>+  GetFunctionAddress $0 `${_FUNC}`
>+  Push `$0`
>+  Call un.TextCompareNoDetailsS
>+  Pop $0
>+  !verbose pop
>+!macroend
>+
>+!macro un.TextCompareNoDetails
>+  !ifndef un.TextCompareNoDetails
>+    !verbose push
>+    !verbose ${_TEXTFUNC_VERBOSE}
>+    !undef _TEXTFUNC_UN
>+    !define _TEXTFUNC_UN `un.`
>+
>+    !insertmacro TextCompareNoDetails
>+
>+    !undef _TEXTFUNC_UN
>+    !define _TEXTFUNC_UN
>+    !verbose pop
>+  !endif
>+!macroend
>+
>+!macro un.TextCompareNoDetailsS
>+  !ifndef un.TextCompareNoDetailsS
>+    !verbose push
>+    !verbose ${_TEXTFUNC_VERBOSE}
>+    !undef _TEXTFUNC_UN
>+    !define _TEXTFUNC_UN `un.`
>+    !undef _TEXTFUNC_S
>+    !define _TEXTFUNC_S `S`
>+
>+    !insertmacro TextCompareNoDetails
>+
>+    !undef _TEXTFUNC_UN
>+    !define _TEXTFUNC_UN
>+    !undef _TEXTFUNC_S
>+    !define _TEXTFUNC_S
>+    !verbose pop
>+  !endif
>+!macroend
>Index: toolkit/mozapps/installer/windows/nsis/makensis.mk
>===================================================================
>RCS file: /cvsroot/mozilla/toolkit/mozapps/installer/windows/nsis/makensis.mk,v
>retrieving revision 1.5
>diff -u -8 -r1.5 makensis.mk
>--- toolkit/mozapps/installer/windows/nsis/makensis.mk	28 Jun 2006 03:10:58 -0000	1.5
>+++ toolkit/mozapps/installer/windows/nsis/makensis.mk	29 Jun 2006 11:33:52 -0000
>@@ -43,16 +43,17 @@
> 
> ABS_CONFIG_DIR := $(shell pwd)/$(CONFIG_DIR)
> 
> SFX_MODULE ?= $(error SFX_MODULE is not defined)
> 
> TOOLKIT_NSIS_FILES = \
> 	common.nsh \
> 	locales.nsi \
>+	overrides.nsh \
> 	ShellLink.dll \
> 	version.nsh \
> 	$(NULL)
> 
> $(CONFIG_DIR)/setup.exe::
> 	$(INSTALL) $(addprefix $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/,$(TOOLKIT_NSIS_FILES)) $(CONFIG_DIR)
> 	$(INSTALL) $(topsrcdir)/toolkit/mozapps/installer/windows/wizard/setuprsc/setup.ico $(CONFIG_DIR)
> 	cd $(CONFIG_DIR) && makensis.exe installer.nsi
>Index: browser/installer/windows/nsis/installer.nsi
>===================================================================
>RCS file: /cvsroot/mozilla/browser/installer/windows/nsis/installer.nsi,v
>retrieving revision 1.3
>diff -u -8 -r1.3 installer.nsi
>--- browser/installer/windows/nsis/installer.nsi	22 Jun 2006 02:04:54 -0000	1.3
>+++ browser/installer/windows/nsis/installer.nsi	29 Jun 2006 11:33:57 -0000
>@@ -62,19 +62,17 @@
> !include WinMessages.nsh
> !include WordFunc.nsh
> !include MUI.nsh
> 
> !insertmacro FileJoin
> !insertmacro GetTime
> !insertmacro LineFind
> !insertmacro un.LineFind
>-!insertmacro Locate
> !insertmacro StrFilter
>-!insertmacro TextCompare
> !insertmacro TrimNewLines
> !insertmacro un.TrimNewLines
> !insertmacro WordFind
> !insertmacro WordReplace
> !insertmacro GetSize
> 
> ; Use the pre-processor where ever possible
> ; Remember that !define's create smaller packages than Var's!
>@@ -100,16 +98,20 @@
> !insertmacro CloseApp
> !insertmacro un.CloseApp
> !insertmacro WriteRegStr2
> !insertmacro WriteRegDWORD2
> !insertmacro WriteRegStrHKCR
> !insertmacro CreateRegKey
> !insertmacro un.GetSecondInstallPath
> 
>+!include overrides.nsh
>+!insertmacro LocateNoDetails
>+!insertmacro TextCompareNoDetails
>+
> Name "${BrandFullName}"
> OutFile "setup.exe"
> InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullName} (${AppVersion})" "InstallLocation"
> InstallDir "$PROGRAMFILES\${BrandFullName}"
> 
> ShowInstDetails nevershow
> ShowUnInstDetails nevershow
> 
>@@ -335,38 +337,45 @@
>   ClearErrors
>   Push 0
> FunctionEnd
> 
> Function FinishInstall
>   FileClose $fhUninstallLog
>   ; Diff and add missing entries from the previous file log if it exists
>   ${If} ${FileExists} "$INSTDIR\uninstall\uninstall.bak"
>+    SetDetailsPrint textonly
>+    DetailPrint $(STATUS_INSTALL_CLEANUP)
>+    SetDetailsPrint none
>+
>     ${LogHeader} "Updating Uninstall Log With Previous Uninstall Log"
>     StrCpy $R0 "$INSTDIR\uninstall\uninstall.log"
>     StrCpy $R1 "$INSTDIR\uninstall\uninstall.bak"
>     GetTempFileName $R2
>     FileOpen $R3 $R2 w
>-    ${TextCompare} "$R1" "$R0" "SlowDiff" "GetDiff"
>+    ${TextCompareNoDetails} "$R1" "$R0" "SlowDiff" "GetDiff"
>     FileClose $R3
>     ${Unless} ${Errors}
>       ${FileJoin} "$INSTDIR\uninstall\uninstall.log" "$R2" "$INSTDIR\uninstall\uninstall.log"
>     ${EndUnless}
>     ${DeleteFile} "$INSTDIR\uninstall\uninstall.bak"
>     ${DeleteFile} "$R2"
>   ${EndIf}
> 
>   Call WriteLogSeparator
>   ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
>   FileWrite $fhInstallLog "${BrandFullName} Installation Finished: $2-$1-$0 $4:$5:$6$\r$\n"
>   FileClose $fhInstallLog
> FunctionEnd
> 
> Section "-Application" Section1
>   SectionIn 1 RO
>+  SetDetailsPrint textonly
>+  DetailPrint $(STATUS_INSTALL_CLEANUP)
>+  SetDetailsPrint none
>   SetOutPath $INSTDIR
>   ; For a "Standard" upgrade without talkback installed add the InstallDisabled
>   ; file to the talkback source files so it will be disabled by the extension
>   ; manager. This is done at the start of the installation since we check for
>   ; the existence of a directory to determine if this is an upgrade.
>   ${If} $InstallType == 1
>   ${AndIf} ${FileExists} "$INSTDIR\greprefs"
>   ${AndIf} ${FileExists} "$EXEDIR\optional\extensions\[e-mail]"
>@@ -400,17 +409,17 @@
> 
>   ${If} ${FileExists} "$INSTDIR\uninstall\uninstall.log"
>     ; Diff cleanup.log with uninstall.bak
>     ${LogHeader} "Updating Uninstall Log With XPInstall Wizard Logs"
>     StrCpy $R0 "$INSTDIR\uninstall\uninstall.log"
>     StrCpy $R1 "$INSTDIR\uninstall\cleanup.log"
>     GetTempFileName $R2
>     FileOpen $R3 $R2 w
>-    ${TextCompare} "$R1" "$R0" "SlowDiff" "GetDiff"
>+    ${TextCompareNoDetails} "$R1" "$R0" "SlowDiff" "GetDiff"
>     FileClose $R3
> 
>     ${Unless} ${Errors}
>       ${FileJoin} "$INSTDIR\uninstall\uninstall.log" "$R2" "$INSTDIR\uninstall\uninstall.log"
>     ${EndUnless}
>     ${DeleteFile} "$INSTDIR\uninstall\cleanup.log"
>     ${DeleteFile} "$R2"
>     ${DeleteFile} "$INSTDIR\uninstall\uninstall.bak"
>@@ -438,16 +447,20 @@
>     ${LogHeader} "Removing Obsolete Files and Directories"
>     ${LineFind} "$EXEDIR\removed-files.log" "/NUL" "1:-1" "onInstallDeleteFile"
>     ${LineFind} "$EXEDIR\removed-files.log" "/NUL" "1:-1" "onInstallRemoveDir"
>   ${EndIf}
> 
>   ${DeleteFile} "$INSTDIR\install_wizard.log"
>   ${DeleteFile} "$INSTDIR\install_status.log"
> 
>+  SetDetailsPrint textonly
>+  DetailPrint $(STATUS_INSTALL_APP)
>+  SetDetailsPrint none
>+
>   ${LogHeader} "Installing Main Files"
>   StrCpy $R0 "$EXEDIR\nonlocalized"
>   StrCpy $R1 "$INSTDIR"
>   Call DoCopyFiles
> 
>   ; Register DLLs
>   ; XXXrstrong - AccessibleMarshal.dll can be used by multiple applications but
>   ; is only registered for the last application installed. When the last
>@@ -471,16 +484,20 @@
>   ${LogUninstall} "File: \components\xpti.dat"
>   ${LogUninstall} "File: \.autoreg"
>   ${LogUninstall} "File: \active-update.xml"
>   ${LogUninstall} "File: \install.log"
>   ${LogUninstall} "File: \install_status.log"
>   ${LogUninstall} "File: \install_wizard.log"
>   ${LogUninstall} "File: \updates.xml"
> 
>+  SetDetailsPrint textonly
>+  DetailPrint $(STATUS_INSTALL_LANG)
>+  SetDetailsPrint none
>+
>   ${LogHeader} "Installing Localized Files"
>   StrCpy $R0 "$EXEDIR\localized"
>   StrCpy $R1 "$INSTDIR"
>   Call DoCopyFiles
> 
>   ${If} $InstallType != 4
>     Call install_talkback
>     ${If} ${FileExists} "$INSTDIR\extensions\[e-mail]"
>@@ -679,28 +696,36 @@
> SectionEnd
> 
> Section /o "Quality Feedback Agent" Section3
>   Call install_talkback
> SectionEnd
> 
> Function install_inspector
>   ${If} ${FileExists} "$EXEDIR\optional\extensions\[e-mail]"
>+    SetDetailsPrint textonly
>+    DetailPrint $(STATUS_INSTALL_OPTIONAL)
>+    SetDetailsPrint none
>+
>     ${RemoveDir} "$INSTDIR\extensions\extensions\[e-mail]"
>     ClearErrors
>     ${LogHeader} "Installing Developer Tools"
>     StrCpy $R0 "$EXEDIR\optional\extensions\[e-mail]"
>     StrCpy $R1 "$INSTDIR\extensions\[e-mail]"
>     Call DoCopyFiles
>   ${EndIf}
> FunctionEnd
> 
> Function install_talkback
>   StrCpy $R0 "$EXEDIR\optional\extensions\[e-mail]"
>   ${If} ${FileExists} "$R0"
>+    SetDetailsPrint textonly
>+    DetailPrint $(STATUS_INSTALL_OPTIONAL)
>+    SetDetailsPrint none
>+
>     StrCpy $R1 "$INSTDIR\extensions\[e-mail]"
>     ${If} ${FileExists} "$R1"
>       ; If there is an existing InstallDisabled file copy it to the source dir.
>       ; This will add it during install to the uninstall.log and retains the
>       ; original disabled state from the installation.
>       ${If} ${FileExists} "$R1\InstallDisabled"
>         CopyFiles "$R1\InstallDisabled" "$R0"
>       ${EndIf}
>@@ -723,16 +748,19 @@
>     ${EndIf}
>     ClearErrors
>     ${LogHeader} "Installing Quality Feedback Agent"
>     Call DoCopyFiles
>   ${EndIf}
> FunctionEnd
> 
> Section "Uninstall"
>+  SetDetailsPrint textonly
>+  DetailPrint $(STATUS_UNINSTALL_MAIN)
>+  SetDetailsPrint none
>   ; Remove registry entries for non-existent apps and for apps that point to our
>   ; install location in the Software\Mozilla key.
>   SetShellVarContext current  ; Sets SHCTX to HKCU
>   ${un.RegCleanMain} "Software\Mozilla"
>   SetShellVarContext all  ; Sets SHCTX to HKLM
>   ${un.RegCleanMain} "Software\Mozilla"
> 
>   ; Remove uninstall entries that point to our install location
>@@ -878,17 +906,17 @@
>     FileWrite $R3 "$9$\r$\n"
>     ${LogMsg} "Added To Uninstall Log: $9"
>   ${EndIf}
>   Push 0
> FunctionEnd
> 
> Function DoCopyFiles
>   StrLen $R2 $R0
>-  ${Locate} "$R0" "/L=FD" "CopyFile"
>+  ${LocateNoDetails} "$R0" "/L=FD" "CopyFile"
> FunctionEnd
> 
> Function CopyFile
>   StrCpy $R3 $R8 "" $R2
>   ${If} $R6 ==  ""
>     ${Unless} ${FileExists} "$R1$R3\$R7"
>       ClearErrors
>       CreateDirectory "$R1$R3\$R7"
>@@ -1051,17 +1079,17 @@
>     FileClose $R2
>     FileClose $R3
> FunctionEnd
> 
> Function DiffOldLogFiles
>   StrCpy $R1 "$1"
>   GetTempFileName $R2
>   FileOpen $R3 $R2 w
>-  ${TextCompare} "$R1" "$TmpVal" "SlowDiff" "GetDiff"
>+  ${TextCompareNoDetails} "$R1" "$TmpVal" "SlowDiff" "GetDiff"
>   FileClose $R3
>   ${FileJoin} "$TmpVal" "$R2" "$TmpVal"
>   ${DeleteFile} "$R2"
> FunctionEnd
> 
> Function CleanOldLogFilesCallback
>   ${TrimNewLines} "$R9" $R9
>   ${WordReplace} "$R9" "$INSTDIR" "" "+" $R3

Comment 6

[Robert Strong (they/them - no direct email)]

Attachment: full patch - oops

Sorry about that.

Carrying over ui-r+ and here are the strings we discussed
+STATUS_INSTALL_APP=Installing ${BrandShortName}...
+STATUS_INSTALL_LANG=Installing Language Files (${AB_CD})...
+STATUS_INSTALL_OPTIONAL=Installing Optional Components...
+STATUS_UNINSTALL_MAIN=Uninstalling ${BrandShortName}...
+STATUS_CLEANUP=A Little Housekeeping...

Comment 7

[Robert Strong (they/them - no direct email)]

Comment on attachment 227664 [details] [diff] [review]
full patch - oops

Sending review to Sir Seth

Comment 8

[(not reading, please use [e-mail] instead)]

Comment on attachment 227664 [details] [diff] [review]
full patch - oops

I didn't review all of overrides.nsh, since (from robert's code comments) this is just a forked version from the NSIS source, slightly modified for our purpose until robert can get these changes made upstream.

the rest of the changes look reasonable to me.

Comment 9

[Robert Strong (they/them - no direct email)]

Checked in to trunk

Comment 10

[Robert Strong (they/them - no direct email)]

Attachment: branch strings only

Strings only so we can get them landed on the branch sooner rather than later. Carrying over Sir Seth's r+ and beltzner's ui-r+

Comment 11

[Robert Strong (they/them - no direct email)]

late-l10n strings checked  the 1.8.1 branch

Comment 12

[Robert Strong (they/them - no direct email)]

Attachment: remaining patch for branch

Carrying forward Sir Seth's r+ and beltzner's ui-r+. I'll request a1.8.1 after it has baked for a day on the trunk

Comment 13

[Robert Strong (they/them - no direct email)]

Comment on attachment 227753 [details] [diff] [review]
remaining patch for branch

Patch has landed on the trunk and the strings are already on the branch... just need the remainder of the patch on the branch to finish this one off.

Comment 14

[Robert Strong (they/them - no direct email)]

Checked in to MOZILLA_1_8_BRANCH for Firefox 2.0