Bug 767918 - Remove Java Console extensions in the install directory's extensions directory on install and app update. r=IanN
Based on patch by Ahmed Abdi Ali.
This commit is contained in:
Родитель
44595121f9
Коммит
02d817a45a
|
@ -249,6 +249,8 @@ Section "-InstallStartCleanup"
|
||||||
; Remove the updates directory for Windows 7 and above
|
; Remove the updates directory for Windows 7 and above
|
||||||
${CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
|
${CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
|
||||||
|
|
||||||
|
${RemoveDeprecatedFiles}
|
||||||
|
|
||||||
${InstallStartCleanupCommon}
|
${InstallStartCleanupCommon}
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
|
|
@ -76,6 +76,8 @@
|
||||||
; VirtualStore directory.
|
; VirtualStore directory.
|
||||||
${CleanVirtualStore}
|
${CleanVirtualStore}
|
||||||
|
|
||||||
|
${RemoveDeprecatedFiles}
|
||||||
|
|
||||||
; Register AccessibleHandler.dll with COM (this writes to HKLM)
|
; Register AccessibleHandler.dll with COM (this writes to HKLM)
|
||||||
${RegisterAccessibleHandler}
|
${RegisterAccessibleHandler}
|
||||||
!macroend
|
!macroend
|
||||||
|
@ -792,6 +794,25 @@
|
||||||
!macroend
|
!macroend
|
||||||
!define RemoveDeprecatedKeys "!insertmacro RemoveDeprecatedKeys"
|
!define RemoveDeprecatedKeys "!insertmacro RemoveDeprecatedKeys"
|
||||||
|
|
||||||
|
; Removes various directories and files for reasons noted below.
|
||||||
|
!macro RemoveDeprecatedFiles
|
||||||
|
; Remove the Java Console extension (bug 1165156)
|
||||||
|
FindFirst $0 $1 "$INSTDIR\extensions\{CAFEEFAC-00*-0000-*-ABCDEFFEDCBA}"
|
||||||
|
loopDirs:
|
||||||
|
StrCmp $1 "" doneDirs
|
||||||
|
${If} ${FileExists} "$INSTDIR\extensions\$1"
|
||||||
|
!ifndef NO_LOG
|
||||||
|
${LogMsg} "Removing Java console edition in: $INSTDIR\extensions\$1"
|
||||||
|
!endif
|
||||||
|
RmDir /r /REBOOTOK "$INSTDIR\extensions\$1"
|
||||||
|
${EndIf}
|
||||||
|
FindNext $0 $1
|
||||||
|
Goto loopDirs
|
||||||
|
doneDirs:
|
||||||
|
FindClose $0
|
||||||
|
!macroend
|
||||||
|
!define RemoveDeprecatedFiles "!insertmacro RemoveDeprecatedFiles"
|
||||||
|
|
||||||
!macro FixClassKeys
|
!macro FixClassKeys
|
||||||
StrCpy $0 "SOFTWARE\Classes"
|
StrCpy $0 "SOFTWARE\Classes"
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче