anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable Uwe to move between installer download screens and still preserve his chosen path.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10042 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-06-10 14:17:48 +00:00
parent f3f6c7bc47
commit 8ee40f1208
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/Win32/packaging/installer/download.nsh
View File

@ -136,8 +136,9 @@
!macro DownloadEnter_Private ExePath RegistryKey RegistrySubKey RemoveFromPath AddtoPath Required DownloadLabel HomeLabel PageHeader PageDescription !macro DownloadEnter_Private ExePath RegistryKey RegistrySubKey RemoveFromPath AddtoPath Required DownloadLabel HomeLabel PageHeader PageDescription
!define skipBackupLbl "skipBackup_${__LINE__}" !define skipBackupLbl "skipBackup_${__LINE__}"
StrCpy ${ExePath} "" ${if} ${ExePath} == ""
ReadRegStr ${ExePath} HKLM "${RegistryKey}" "${RegistrySubKey}" ReadRegStr ${ExePath} HKLM "${RegistryKey}" "${RegistrySubKey}"
${endif}
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioDownload.ini" "Field 1" "Text" "" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioDownload.ini" "Field 1" "Text" ""
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioDownload.ini" "Field 2" "Text" "$(DownloadPageField2)" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioDownload.ini" "Field 2" "Text" "$(DownloadPageField2)"

13
development/Win32/packaging/installer/lyx_installer.nsi
View File

@ -306,13 +306,19 @@ Function .onInit
!undef READ_ONLY !undef READ_ONLY
${endif} ${endif}
StrCpy $MinSYSPath ""
StrCpy $PythonPath ""
StrCpy $MiKTeXPath ""
StrCpy $PerlPath ""
StrCpy $GhostscriptPath ""
StrCpy $ImageMagickPath ""
ClearErrors ClearErrors
FunctionEnd FunctionEnd
;-------------------------------- ;--------------------------------
Function DownloadMinSYS Function DownloadMinSYS
StrCpy $MinSYSPath ""
StrCpy $DownloadMinSYS "0" StrCpy $DownloadMinSYS "0"
; Search the registry for the MinSYS uninstaller. ; Search the registry for the MinSYS uninstaller.
@ -361,7 +367,6 @@ FunctionEnd
;-------------------------------- ;--------------------------------
Function DownloadPython Function DownloadPython
StrCpy $PythonPath ""
StrCpy $DownloadPython "0" StrCpy $DownloadPython "0"
${DownloadEnter} \ ${DownloadEnter} \
@ -389,7 +394,6 @@ FunctionEnd
Function DownloadMiKTeX Function DownloadMiKTeX
StrCpy $DoNotRequireMiKTeX "1" StrCpy $DoNotRequireMiKTeX "1"
StrCpy $MiKTeXPath ""
StrCpy $DownloadMiKTeX "0" StrCpy $DownloadMiKTeX "0"
${DownloadEnter} \ ${DownloadEnter} \
@ -417,7 +421,6 @@ FunctionEnd
Function DownloadPerl Function DownloadPerl
StrCpy $DoNotRequirePerl "1" StrCpy $DoNotRequirePerl "1"
StrCpy $PerlPath ""
StrCpy $DownloadPerl "1" StrCpy $DownloadPerl "1"
${DownloadEnter} \ ${DownloadEnter} \
@ -445,7 +448,6 @@ FunctionEnd
Function DownloadGhostscript Function DownloadGhostscript
StrCpy $DoNotRequireGhostscript "1" StrCpy $DoNotRequireGhostscript "1"
StrCpy $GhostscriptPath ""
StrCpy $DownloadGhostscript "0" StrCpy $DownloadGhostscript "0"
; Find which version of ghostscript, if any, is installed. ; Find which version of ghostscript, if any, is installed.
@ -481,7 +483,6 @@ FunctionEnd
Function DownloadImageMagick Function DownloadImageMagick
StrCpy $DoNotRequireImageMagick "1" StrCpy $DoNotRequireImageMagick "1"
StrCpy $ImageMagickPath ""
StrCpy $DownloadImageMagick "0" StrCpy $DownloadImageMagick "0"
${DownloadEnter} \ ${DownloadEnter} \