comparison pidgin/win32/nsis/pidgin-installer.nsi @ 32741:07b3035b4319

Update the win32 spellcheck downloading to go through the redirector php script on pidgin.im. Currently this will just forward to a oo.o mirror that still has the dictionaries available, but it also gives us the flexibility handle such situations better in the future. Fixes #14612
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 29 Feb 2012 03:15:39 +0000
parents a5384cd9b332
children
comparison
equal deleted inserted replaced
32740:200a6032d8ec 32741:07b3035b4319
69 69
70 !define GTK_MIN_VERSION "2.14.0" 70 !define GTK_MIN_VERSION "2.14.0"
71 !define PERL_REG_KEY "SOFTWARE\Perl" 71 !define PERL_REG_KEY "SOFTWARE\Perl"
72 !define PERL_DLL "perl510.dll" 72 !define PERL_DLL "perl510.dll"
73 73
74 !define DOWNLOADER_URL "http://pidgin.im/win32/download_redir.php" 74 !define DOWNLOADER_URL "http://pidgin.im/win32/download_redir.php?version=${PIDGIN_VERSION}"
75 !define SPELL_DOWNLOAD_URL "http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries"
76 75
77 !define MEMENTO_REGISTRY_ROOT HKLM 76 !define MEMENTO_REGISTRY_ROOT HKLM
78 !define MEMENTO_REGISTRY_KEY "${PIDGIN_UNINSTALL_KEY}" 77 !define MEMENTO_REGISTRY_KEY "${PIDGIN_UNINSTALL_KEY}"
79 78
80 ;-------------------------------- 79 ;--------------------------------
262 261
263 !else 262 !else
264 263
265 ; We need to download the GTK+ runtime 264 ; We need to download the GTK+ runtime
266 retry: 265 retry:
267 StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&gtk_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk" 266 StrCpy $R2 "${DOWNLOADER_URL}&gtk_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk"
268 DetailPrint "Downloading GTK+ Runtime ... ($R2)" 267 DetailPrint "Downloading GTK+ Runtime ... ($R2)"
269 NSISdl::download /TIMEOUT=10000 $R2 $R1 268 NSISdl::download /TIMEOUT=10000 $R2 $R1
270 Pop $R0 269 Pop $R0
271 ;StrCmp $R0 "cancel" done 270 ;StrCmp $R0 "cancel" done
272 StrCmp $R0 "success" +2 271 StrCmp $R0 "success" +2
461 460
462 !else 461 !else
463 462
464 ; We need to download the debug symbols 463 ; We need to download the debug symbols
465 retry: 464 retry:
466 StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=dbgsym" 465 StrCpy $R2 "${DOWNLOADER_URL}&dl_pkg=dbgsym"
467 DetailPrint "Downloading Debug Symbols... ($R2)" 466 DetailPrint "Downloading Debug Symbols... ($R2)"
468 NSISdl::download /TIMEOUT=10000 $R2 $R1 467 NSISdl::download /TIMEOUT=10000 $R2 $R1
469 Pop $R0 468 Pop $R0
470 StrCmp $R0 "cancel" done 469 StrCmp $R0 "cancel" done
471 StrCmp $R0 "success" +2 470 StrCmp $R0 "success" +2
1272 1271
1273 InitPluginsDir 1272 InitPluginsDir
1274 1273
1275 ; We need to download and install dictionary 1274 ; We need to download and install dictionary
1276 StrCpy $R2 "$PLUGINSDIR\$R1" 1275 StrCpy $R2 "$PLUGINSDIR\$R1"
1277 StrCpy $R3 "${SPELL_DOWNLOAD_URL}/$R1" 1276 StrCpy $R3 "${DOWNLOADER_URL}&dl_pkg=oo_dict&lang=$R1&lang_file=$R1"
1278 DetailPrint "Downloading the $R0 Dictionary... ($R3)" 1277 DetailPrint "Downloading the $R0 Dictionary... ($R3)"
1279 retry: 1278 retry:
1280 NSISdl::download /TIMEOUT=10000 "$R3" "$R2" 1279 NSISdl::download /TIMEOUT=10000 "$R3" "$R2"
1281 Pop $R4 1280 Pop $R4
1282 StrCmp $R4 "cancel" done 1281 StrCmp $R4 "cancel" done