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

Fixed empty substitutions not being recognised

Browse source 
Removed redundant call of autodetect in section
Renamed gtk+ defines to gtk
This commit is contained in:
John Garland 2009-02-28 09:30:49 +00:00
commit 2831e10a24
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
win32/deluge.nsi
View file

@ -14,7 +14,7 @@
!macro create_detect component reg_path reg_key !macro create_detect component reg_path reg_key
Function detect_${component} Function detect_${component}
ReadRegStr $0 HKLM ${reg_path} ${reg_key} ReadRegStr $0 HKLM "${reg_path}" "${reg_key}"
IfErrors 0 +3 IfErrors 0 +3
SectionSetInstTypes ${${component}} ${AUTO_FULL_INST} SectionSetInstTypes ${${component}} ${AUTO_FULL_INST}
SetCurInstType ${AUTODETECT_INST} SetCurInstType ${AUTODETECT_INST}
@ -193,8 +193,6 @@ SectionGroup /e "Dependencies" dependencies
Section "Python" python Section "Python" python
${autodetect} python
${install_MSI} PYTHON_INSTALLER "$INSTDIR\Python" ${install_MSI} PYTHON_INSTALLER "$INSTDIR\Python"
SectionEnd SectionEnd
@ -207,7 +205,7 @@ SectionGroup /e "Dependencies" dependencies
SectionEnd SectionEnd
Section "GTK+ Runtime" gtk+ Section "GTK+ Runtime" gtk
SectionIn 2 SectionIn 2
@ -310,7 +308,7 @@ SectionGroup /e "un.Dependencies" undependencies
SectionEnd SectionEnd
Section "un.GTK+ Runtime" ungtk+ Section "un.GTK+ Runtime" ungtk
SectionEnd SectionEnd
@ -375,11 +373,11 @@ SectionGroupEnd
; Functions ; Functions
${create_detect} python ${PYTHON_REG_PATH} ${PYTHON_REG_KEY} ${create_detect} python "${PYTHON_REG_PATH}" "${PYTHON_REG_KEY}"
${create_detect} gtk ${GTK_REG_PATH} ${GTK_REG_KEY} ${create_detect} gtk "${GTK_REG_PATH}" "${GTK_REG_KEY}"
Function set_python_dir Function set_python_dir
ReadRegStr $PYTHONDIR HKLM ${PYTHON_REG_PATH} ${PYTHON_REG_KEY} ReadRegStr $PYTHONDIR HKLM "${PYTHON_REG_PATH}" "${PYTHON_REG_KEY}"
IfErrors 0 +2 IfErrors 0 +2
StrCpy $PYTHONDIR "$INSTDIR\Python" StrCpy $PYTHONDIR "$INSTDIR\Python"
FunctionEnd FunctionEnd