Bug 663636 - Missing addons, directory distribution/extensions is not there. r=KaiRo a=KaiRo
authorJustin Wood <bugspam.Callek>
Thu, 16 Jun 2011 22:07:00 -0400
changeset 7853 e2050a2ff32a3e53f6bccf12dcb93d85a02b738e
parent 7852 0585fb0f861900587549dc7f5936779c312ca109
child 7854 49d9e37601683ce73f867ad60b35a2f0736bc655
push id25
push userCallek@gmail.com
push dateSat, 18 Jun 2011 03:06:10 +0000
treeherdercomm-aurora@e2050a2ff32a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersKaiRo, KaiRo
bugs663636
Bug 663636 - Missing addons, directory distribution/extensions is not there. r=KaiRo a=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"