mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-06 08:28:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Windows installer files

Browse source
This commit is contained in:
Andrew Resch 2010-03-19 12:23:51 -07:00
commit fd5460b403
2 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
win32/deluge-bbfreeze.py
View file

@ -1,4 +1,4 @@
build_version = "1.2.1" build_version = "1.2.2"
python_path = "C:\\Python26\\" python_path = "C:\\Python26\\"
import shutil import shutil

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

@ -37,14 +37,14 @@ SetCompressor lzma
# Deluge program information # Deluge program information
!define PROGRAM_NAME "Deluge" !define PROGRAM_NAME "Deluge"
!define PROGRAM_VERSION "1.2.1" !define PROGRAM_VERSION "1.2.2"
!define PROGRAM_WEB_SITE "http://deluge-torrent.org" !define PROGRAM_WEB_SITE "http://deluge-torrent.org"
# Python files generated with bbfreeze (without DLLs from GTK+ runtime) # Python files generated with bbfreeze (without DLLs from GTK+ runtime)
!define DELUGE_PYTHON_BBFREEZE_OUTPUT_DIR "..\build-win32\deluge-bbfreeze-${PROGRAM_VERSION}" !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 # 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 --- # --- Interface settings ---
@ -227,25 +227,15 @@ SectionEnd
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 # 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 # 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 IfErrors GTK_install_start 0
${VersionCompare} $0 "2.11" $1 ${VersionCompare} $0 "2.16.6-2010-02-24-ash" $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
StrCmp $1 "1" 0 +3 StrCmp $1 "1" 0 +3
MessageBox MB_ICONEXCLAMATION|MB_OK "You have GTK+ $0 installed on your system. \ 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." The Deluge installer will not download and install the GTK+ 2.16 runtime."
Goto GTK_install_exit 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: 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. \