Bug 1070988 - Windows installer should remove leftover chrome.manifest on pave over install to prevent startup crash with Firefox 32 and above with unpacked omni.ja. r=tabraldes, a=sledru
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 24 Sep 2014 00:33:58 -0700
changeset 216838 9286fb781568
parent 216837 599ae9ec1b9c
child 216839 bb4423c0da47
push id3938
push userryanvm@gmail.com
push date2014-09-24 13:50 +0000
treeherdermozilla-beta@9286fb781568 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstabraldes, sledru
bugs1070988
milestone33.0
Bug 1070988 - Windows installer should remove leftover chrome.manifest on pave over install to prevent startup crash with Firefox 32 and above with unpacked omni.ja. r=tabraldes, a=sledru
browser/installer/windows/nsis/shared.nsh
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -1003,16 +1003,24 @@ FunctionEnd
   ClearErrors
 !macroend
 
 !define RemoveDEHRegistration "!insertmacro RemoveDEHRegistration"
 !define un.RemoveDEHRegistration "!insertmacro RemoveDEHRegistration"
 
 ; Removes various directories and files for reasons noted below.
 !macro RemoveDeprecatedFiles
+  ; Some users are ending up with unpacked chrome instead of omni.ja. This
+  ; causes Firefox to break badly after upgrading from Firefox 31, see bug
+  ; 1063052. Removing the chrome.manifest from the install directory causes
+  ; Firefox to use the updated omni.ja so it won't crash.
+  ${If} ${FileExists} "$INSTDIR\chrome.manifest"
+    Delete "$INSTDIR\chrome.manifest"
+  ${EndIf}
+
   ; Remove talkback if it is present (remove after bug 386760 is fixed)
   ${If} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org"
     RmDir /r /REBOOTOK "$INSTDIR\extensions\talkback@mozilla.org"
   ${EndIf}
 
   ; Remove the Java Console extension (bug 597235)
   ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0012-ABCDEFFEDCBA}"
     RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0015-0000-0012-ABCDEFFEDCBA}"