Module: deluge Branch: 1.2-stable Commit: fd5460b4034f4ee5290804eb69119a505e2c7a16
Author: Andrew Resch <[email protected]> Date: Fri Mar 19 12:23:51 2010 -0700 Update Windows installer files --- win32/deluge-bbfreeze.py | 2 +- win32/deluge-win32-installer.nsi | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/win32/deluge-bbfreeze.py b/win32/deluge-bbfreeze.py index 240c317..1179dd3 100644 --- a/win32/deluge-bbfreeze.py +++ b/win32/deluge-bbfreeze.py @@ -1,4 +1,4 @@ -build_version = "1.2.1" +build_version = "1.2.2" python_path = "C:\\Python26\\" import shutil diff --git a/win32/deluge-win32-installer.nsi b/win32/deluge-win32-installer.nsi index b689166..83c790f 100644 --- a/win32/deluge-win32-installer.nsi +++ b/win32/deluge-win32-installer.nsi @@ -37,14 +37,14 @@ SetCompressor lzma # Deluge program information !define PROGRAM_NAME "Deluge" -!define PROGRAM_VERSION "1.2.1" +!define PROGRAM_VERSION "1.2.2" !define PROGRAM_WEB_SITE "http://deluge-torrent.org"; # Python files generated with bbfreeze (without DLLs from GTK+ runtime) !define DELUGE_PYTHON_BBFREEZE_OUTPUT_DIR "..\build-win32\deluge-bbfreeze-${PROGRAM_VERSION}" # Installer for GTK+ 2.12 runtime; will be downloaded from deluge-torrent.org -!define DELUGE_GTK_DEPENDENCY "gtk2-runtime-2.16.6-2009-12-01-ash.exe" +!define DELUGE_GTK_DEPENDENCY "gtk2-runtime-2.16.6-2010-02-24-ash.exe" # --- Interface settings --- @@ -227,25 +227,15 @@ SectionEnd Section "GTK+ 2.16 runtime" Section4 # Check whether GTK+ 2.12 is installed on the system; if so skip this section # The criterion is whether the registry key HKLM\SOFTWARE\GTK\2.0\Version exists - ReadRegStr $0 HKLM "SOFTWARE\GTK\2.0" "Version" + ReadRegStr $0 HKLM "SOFTWARE\GTK2-Runtime" "PackageVersion" IfErrors GTK_install_start 0 - ${VersionCompare} $0 "2.11" $1 - StrCmp $1 "2" 0 +3 - MessageBox MB_ICONEXCLAMATION|MB_OK "Your GTK+ runtime version is $0 and Deluge will not work with GTK+ 2.10 or earlier. \ - The Deluge installer will not download and install GTK+ 2.16 runtime. Sorry, but you will have to resolve this conflict manually. \ - If in doubt, you can ask for help in the Deluge forum or IRC channel." - Goto GTK_install_exit - - ${VersionCompare} $0 "2.13" $1 + ${VersionCompare} $0 "2.16.6-2010-02-24-ash" $1 StrCmp $1 "1" 0 +3 MessageBox MB_ICONEXCLAMATION|MB_OK "You have GTK+ $0 installed on your system. \ The Deluge installer will not download and install the GTK+ 2.16 runtime." Goto GTK_install_exit - MessageBox MB_OK "You have GTK+ $0 installed on your system. The Deluge installer will not download and install the GTK+ runtime." - Goto GTK_install_exit - GTK_install_start: MessageBox MB_OK "You will now download and run the installer for the GTK+ 2.16 runtime. \ You must be connected to the internet before you press the OK button. \ -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
