Bug 1275731: Add IA2Marshal.dll to package and installer; r=rstrong
authorAaron Klotz <aklotz@mozilla.com>
Mon, 18 Jul 2016 16:46:14 -0600
changeset 330902 b89f326ea06438d137b0baa91e124bac07e67b0c
parent 330901 6867c82fc64d3cf763bc7dcff2ed42f96c9c0dfe
child 330903 b125c700ca86f4aecf1d5c5ee86d94f783abffa3
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs1275731
milestone50.0a1
Bug 1275731: Add IA2Marshal.dll to package and installer; r=rstrong MozReview-Commit-ID: JSI1Rd5cloD
browser/installer/package-manifest.in
browser/installer/windows/nsis/shared.nsh
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -143,16 +143,17 @@
 #endif
 
 ; [Components]
 @RESPATH@/browser/components/components.manifest
 @RESPATH@/components/alerts.xpt
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
+@BINPATH@/IA2Marshal.dll
 #endif
 @RESPATH@/components/accessibility.xpt
 #endif
 @RESPATH@/components/appshell.xpt
 @RESPATH@/components/appstartup.xpt
 @RESPATH@/components/autocomplete.xpt
 @RESPATH@/components/autoconfig.xpt
 @RESPATH@/components/browser-element.xpt
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -1365,16 +1365,17 @@
 ; directory.
 !macro PushFilesToCheck
   ; The first string to be pushed onto the stack MUST be "end" to indicate
   ; that there are no more files to check in $INSTDIR and the last string
   ; should be ${FileMainEXE} so if it is in use the CheckForFilesInUse macro
   ; returns after the first check.
   Push "end"
   Push "AccessibleMarshal.dll"
+  Push "IA2Marshal.dll"
   Push "freebl3.dll"
   Push "nssckbi.dll"
   Push "nspr4.dll"
   Push "nssdbm3.dll"
   Push "mozsqlite3.dll"
   Push "xpcom.dll"
   Push "crashreporter.exe"
   Push "updater.exe"