Bug 663636 - Missing addons, directory distribution/extensions is not there. r=KaiRo
authorJustin Wood <Callek@gmail.com>
Fri, 17 Jun 2011 01:05:28 -0400
changeset 7959 70f82b97c52c1c23ed94f85e3a0fb02bc9f0337e
parent 7958 9685aa9dadd42a15a820a822d785ea8cd63d1a8d
child 7960 c53843c0d1bbb5ccdec03a0214a24b4f8c9caabf
push id6122
push userCallek@gmail.com
push dateSat, 18 Jun 2011 03:03:23 +0000
treeherdercomm-central@70f82b97c52c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersKaiRo
bugs663636
Bug 663636 - Missing addons, directory distribution/extensions is not there. r=KaiRo
suite/installer/windows/nsis/installer.nsi
--- a/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -294,16 +294,22 @@ Section "-Application" APP_IDX
   DetailPrint $(STATUS_INSTALL_APP)
   SetDetailsPrint none
 
   ${LogHeader} "Installing Main Files"
   ${CopyFilesFromDir} "$EXEDIR\core" "$INSTDIR" \
                       "$(ERROR_CREATE_DIRECTORY_PREFIX)" \
                       "$(ERROR_CREATE_DIRECTORY_SUFFIX)"
 
+  ; distribution/extensions must exist for the optional extensions to install
+  ; properly. Ensure it is present on install, no harm if it is empty.
+  ; CreateDirectory creates nested dirs if required. If already present we'll
+  ; Just fix ourselves on ClearErrors below
+  CreateDirectory "$INSTDIR\distribution\extensions"
+
   ; The MAPI DLL's are copied and the copies are then registered to lessen
   ; file in use errors on application update.
   ClearErrors
   ${DeleteFile} "$INSTDIR\MapiProxy_InUse.dll"
   ${If} ${Errors}
     ; Clear the way for the new file and delete the old file on reboot
     Rename "$INSTDIR\MapiProxy_InUse.dll" "$INSTDIR\MapiProxy_InUse.dll.moz-delete"
     Delete /REBOOTOK "$INSTDIR\MapiProxy_InUse.dll.moz-delete"