Mercurial > pidgin

comparison pidgin/win32/nsis/pidgin-installer.nsi @ 29487:c08740a93dd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various installer bug fixes
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 25 Feb 2010 06:35:35 +0000
parents 15e26b945a7a
children 996eb83a1162
comparison
equal deleted inserted replaced
29486:3015b7c2bec3 29487:c08740a93dd1
350 DetailPrint "Downloading GTK+ Runtime ... ($R2)" 350 DetailPrint "Downloading GTK+ Runtime ... ($R2)"
351 NSISdl::download /TIMEOUT=10000 $R2 $R1 351 NSISdl::download /TIMEOUT=10000 $R2 $R1
352 Pop $R0 352 Pop $R0
353 StrCmp $R0 "cancel" done 353 StrCmp $R0 "cancel" done
354 StrCmp $R0 "success" +2 354 StrCmp $R0 "success" +2
355 MessageBox MB_RETRYCANCEL "$(PIDGIN_GTK_DOWNLOAD_ERROR) : $R1" /SD IDCANCEL IDRETRY retry IDCANCEL done 355 MessageBox MB_RETRYCANCEL "$(PIDGIN_GTK_DOWNLOAD_ERROR) : $R2" /SD IDCANCEL IDRETRY retry IDCANCEL done
356 356
357 !endif 357 !endif
358 358
359 SetOutPath "$INSTDIR" 359 SetOutPath "$INSTDIR"
360
361 nsisunz::UnzipToLog $R1 "$INSTDIR" 360 nsisunz::UnzipToLog $R1 "$INSTDIR"
362 Pop $R0 361 Pop $R0
363 StrCmp $R0 "success" +2 362 StrCmp $R0 "success" +2
364 DetailPrint "$R0" ;print error message to log 363 DetailPrint "$R0" ;print error message to log
365 364
608 Call InstallAspellAndDict 607 Call InstallAspellAndDict
609 SectionEnd 608 SectionEnd
610 SectionGroupEnd 609 SectionGroupEnd
611 610
612 Section /o $(DEBUG_SYMBOLS_SECTION_TITLE) SecDebugSymbols 611 Section /o $(DEBUG_SYMBOLS_SECTION_TITLE) SecDebugSymbols
612
613 InitPluginsDir 613 InitPluginsDir
614 614 StrCpy $R1 "$PLUGINSDIR\dbgsym.zip"
615 ; We need to download and extract the debug symbols
616 StrCpy $R1 "$PLUGINSDIR\pidgin-${PIDGIN_VERSION}-dbgsym.zip"
617 !ifdef OFFLINE_INSTALLER 615 !ifdef OFFLINE_INSTALLER
618 616
619 SetOutPath $PLUGINSDIR 617 SetOutPath $PLUGINSDIR
620 File /oname=pidgin-${PIDGIN_VERSION}-dbgsym.zip "..\..\..\..\gtk_installer\gtk-runtime-${GTK_INSTALL_VERSION}.zip" 618 File /oname=dbgsym.zip "..\..\..\pidgin-${PIDGIN_VERSION}-dbgsym.zip"
621 619
622 !else 620 !else
623 621
622 ; We need to download the debug symbols
624 retry: 623 retry:
625 StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=dbgsym" 624 StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=dbgsym"
626 DetailPrint "Downloading Debug Symbols... ($R2)" 625 DetailPrint "Downloading Debug Symbols... ($R2)"
627 NSISdl::download /TIMEOUT=10000 $R2 $R1 626 NSISdl::download /TIMEOUT=10000 $R2 $R1
628 Pop $R0 627 Pop $R0
630 StrCmp $R0 "success" +2 629 StrCmp $R0 "success" +2
631 MessageBox MB_RETRYCANCEL "$(PIDGIN_DEBUGSYMBOLS_ERROR) : $R2" /SD IDCANCEL IDRETRY retry IDCANCEL done 630 MessageBox MB_RETRYCANCEL "$(PIDGIN_DEBUGSYMBOLS_ERROR) : $R2" /SD IDCANCEL IDRETRY retry IDCANCEL done
632 631
633 !endif 632 !endif
634 633
634 SetOutPath "$INSTDIR"
635 nsisunz::UnzipToLog $R1 "$INSTDIR" 635 nsisunz::UnzipToLog $R1 "$INSTDIR"
636 Pop $R0 636 Pop $R0
637 StrCmp $R0 "success" +2 637 StrCmp $R0 "success" +2
638 DetailPrint "$R0" ;print error message to log 638 DetailPrint "$R0" ;print error message to log
639 639
799 RMDir /r "$INSTDIR\pidgin-${PIDGIN_VERSION}-dbgsym" 799 RMDir /r "$INSTDIR\pidgin-${PIDGIN_VERSION}-dbgsym"
800 800
801 ; Remove the local GTK+ copy (if we're not just upgrading) 801 ; Remove the local GTK+ copy (if we're not just upgrading)
802 ${GetParameters} $R0 802 ${GetParameters} $R0
803 ClearErrors 803 ClearErrors
804 ${GetOptions} "$R3" "/KEEPGTK=" $R1 804 ${GetOptions} "$R0" "/KEEPGTK=" $R1
805 IfErrors +2 805 IfErrors +2
806 StrCmp $R1 "1" +2 806 StrCmp $R1 "1" +2
807 RMDir /r "$INSTDIR\Gtk" 807 RMDir /r "$INSTDIR\Gtk"
808 808
809 ;Try to remove Pidgin install dir (only if empty) 809 ;Try to remove Pidgin install dir (only if empty)
1366 1366
1367 Function preWelcomePage 1367 Function preWelcomePage
1368 Push $R0 1368 Push $R0
1369 Push $R1 1369 Push $R1
1370 1370
1371 !ifdef OFFLINE_INSTALLER
1372 !insertmacro SelectSection ${SecDebugSymbols}
1373 !endif
1374
1371 Call DoWeNeedGtk 1375 Call DoWeNeedGtk
1372 Pop $R0 1376 Pop $R0
1373 IntCmp $R0 1 done gtk_not_mandatory 1377 IntCmp $R0 1 done gtk_not_mandatory
1374 ; Make the GTK+ Section RO if it is required. 1378 ; Make the GTK+ Section RO if it is required.
1375 !insertmacro SetSectionFlag ${SecGtk} ${SF_RO} 1379 !insertmacro SetSectionFlag ${SecGtk} ${SF_RO}