mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-02 22:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Windows installer

Browse source
This commit is contained in:
Andrew Resch 2010-03-19 13:36:36 -07:00
commit 03b9b940af
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
win32/deluge-bbfreeze.py
View file

@ -10,7 +10,7 @@ shutil.copy(python_path + "Scripts\deluge-console-script.py", python_path + "Scr
from bbfreeze import Freezer 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\deluge.py", gui_only=False)
f.addScript(python_path + "Scripts\deluged.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) f.addScript(python_path + "Scripts\deluge-web.py", gui_only=False)

13
win32/deluge-win32-installer.nsi
View file

@ -225,17 +225,6 @@ SectionEnd
# Install GTK+ 2.16 # Install GTK+ 2.16
Section "GTK+ 2.16 runtime" Section4 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: GTK_install_start:
MessageBox MB_OK "You will now download and run the installer for the GTK+ 2.16 runtime. \ 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 must be connected to the internet before you press the OK button. \
@ -251,7 +240,7 @@ Section "GTK+ 2.16 runtime" Section4
Pop $2 Pop $2
StrCmp $2 "success" 0 GTK_download_error StrCmp $2 "success" 0 GTK_download_error
ExecWait "$TEMP\${DELUGE_GTK_DEPENDENCY}" ExecWait '"$TEMP\${DELUGE_GTK_DEPENDENCY}" /compatdlls=yes'
Goto GTK_install_exit Goto GTK_install_exit
GTK_download_error: GTK_download_error: