Module: deluge Branch: 1.2-stable Commit: 03b9b940afef022c8f3824572be406fc3d704d69
Author: Andrew Resch <[email protected]> Date: Fri Mar 19 13:36:36 2010 -0700 Update Windows installer --- win32/deluge-bbfreeze.py | 2 +- win32/deluge-win32-installer.nsi | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/win32/deluge-bbfreeze.py b/win32/deluge-bbfreeze.py index 1179dd3..b7c4c75 100644 --- a/win32/deluge-bbfreeze.py +++ b/win32/deluge-bbfreeze.py @@ -10,7 +10,7 @@ shutil.copy(python_path + "Scripts\deluge-console-script.py", python_path + "Scr from bbfreeze import Freezer -f = Freezer("..\\build-win32\\deluge-bbfreeze-" + build_version, includes=("libtorrent", "gzip", "zipfile", "re", "socket", "struct", "cairo", "pangocairo", "atk", "pango", "wsgiref.handlers", "twisted.internet.utils")) +f = Freezer("..\\build-win32\\deluge-bbfreeze-" + build_version, includes=("libtorrent", "gzip", "zipfile", "re", "socket", "struct", "cairo", "pangocairo", "atk", "pango", "wsgiref.handlers", "twisted.internet.utils", "gio", "gtk.glade")) f.addScript(python_path + "Scripts\deluge.py", gui_only=False) f.addScript(python_path + "Scripts\deluged.py", gui_only=False) f.addScript(python_path + "Scripts\deluge-web.py", gui_only=False) diff --git a/win32/deluge-win32-installer.nsi b/win32/deluge-win32-installer.nsi index 83c790f..62144d7 100644 --- a/win32/deluge-win32-installer.nsi +++ b/win32/deluge-win32-installer.nsi @@ -225,17 +225,6 @@ SectionEnd # Install GTK+ 2.16 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\GTK2-Runtime" "PackageVersion" - IfErrors GTK_install_start 0 - - ${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 - 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. \ @@ -251,7 +240,7 @@ Section "GTK+ 2.16 runtime" Section4 Pop $2 StrCmp $2 "success" 0 GTK_download_error - ExecWait "$TEMP\${DELUGE_GTK_DEPENDENCY}" + ExecWait '"$TEMP\${DELUGE_GTK_DEPENDENCY}" /compatdlls=yes' Goto GTK_install_exit GTK_download_error: -- 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.
