Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved functions to bottom so that they could include defines

Browse Source 
Installer now automatically selects python if not installed
This commit is contained in:
John Garland 2009-02-25 12:09:31 +00:00
parent 16c8769ab9
commit 270bb4ae1b
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
win32/deluge.nsi
View File

@ -107,25 +107,6 @@
var PYTHONDIR var PYTHONDIR
; Functions
Function autodetect_python
Pop $0
ReadRegStr "" HKLM "SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath" ""
IfErrors 0 +2
SectionSetInstTypes $0 3
FunctionEnd
Function set_python_dir
ReadRegStr $PYTHONDIR HKLM "SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath" ""
IfErrors 0 +2
StrCpy $PYTHONDIR "$INSTDIR\Python"
FunctionEnd
Function .onInit
Call set_python_dir
FunctionEnd
; General Settings ; General Settings
; Version ; Version
@ -376,3 +357,24 @@ SectionGroupEnd
!insertmacro MUI_DESCRIPTION_TEXT ${deluge} $(DESC_deluge) !insertmacro MUI_DESCRIPTION_TEXT ${deluge} $(DESC_deluge)
!insertmacro MUI_DESCRIPTION_TEXT ${python} $(DESC_python) !insertmacro MUI_DESCRIPTION_TEXT ${python} $(DESC_python)
!insertmacro MUI_FUNCTION_DESCRIPTION_END !insertmacro MUI_FUNCTION_DESCRIPTION_END
; Functions
Function autodetect_python
Pop $0
ReadRegStr "" HKLM "SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath" ""
IfErrors 0 +3
SectionSetInstTypes $0 3
SetCurInstType 0
FunctionEnd
Function set_python_dir
ReadRegStr $PYTHONDIR HKLM "SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath" ""
IfErrors 0 +2
StrCpy $PYTHONDIR "$INSTDIR\Python"
FunctionEnd
Function .onInit
Call set_python_dir
${autodetect} python
FunctionEnd