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

installer: really fix splitindex support this time

Browse Source 
- for splitindex the installer has to install Perl to MiKTeX but 64bit MiKTeX works with Perl using a different folder structure than 32bit MiKTeX
This commit is contained in:
Uwe Stöhr 2013-05-19 18:46:14 +02:00
parent 762c4eca57
commit 1c362cc773
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
development/Win32/packaging/installer/include/LaTeX.nsh
View File

@ -289,7 +289,9 @@ Function ConfigureMiKTeX
MessageBox MB_OK|MB_ICONINFORMATION "$(MultipleIndexesNotAvailable)" MessageBox MB_OK|MB_ICONINFORMATION "$(MultipleIndexesNotAvailable)"
${endif} ${endif}
${else} ${else}
${ifnot} ${FileExists} "$PathLaTeX\perl.exe" # ${FileExists} is disabled for now to repair existing LyX installations using 64bit MiKTeX
# re-enable this for LyX 2.1.1
#${ifnot} ${FileExists} "$PathLaTeX\perl.exe"
${if} $Is64bit == "true" ${if} $Is64bit == "true"
StrCpy $3 "$PathLaTeX" -15 # delete "\miktex\bin\x64" StrCpy $3 "$PathLaTeX" -15 # delete "\miktex\bin\x64"
${else} ${else}
@ -298,28 +300,34 @@ Function ConfigureMiKTeX
SetOutPath "$3" SetOutPath "$3"
File /r ${FILES_MIKTEX} File /r ${FILES_MIKTEX}
# move the files to the correct location for 64bit # move the files to the correct location for 64bit
# on 32bit MiKTeX the lib folder has to be parallel to the bin folder
# while on 64bit MiKTeX the lib folder has to be inside the bin folder
${if} $Is64bit == "true" ${if} $Is64bit == "true"
CopyFiles /SILENT /FILESONLY "$3\miktex\bin\*.*" "$PathLaTeX" CopyFiles /SILENT /FILESONLY "$3\miktex\bin\*.*" "$PathLaTeX"
CreateDirectory "$3\miktex\bin\x64\lib" CreateDirectory "$3\miktex\bin\x64\lib"
CopyFiles /SILENT "$3\miktex\bin\lib\*.*" "$3\miktex\bin\x64\lib" CopyFiles /SILENT "$3\miktex\lib\*.*" "$3\miktex\bin\x64\lib"
RMDir /r "$3\miktex\bin\lib" RMDir /r "$3\miktex\lib"
RMDir /r "$3\miktex\bin\lib" # to clean up existing installations; can be removed for LyX 2.1.1
Delete "$3\miktex\bin\*.*" Delete "$3\miktex\bin\*.*"
${endif} ${endif}
${endif} #${endif}
${endif} ${endif}
${else} # if admin or power user ${else} # if admin or power user
${ifnot} ${FileExists} "$PathLaTeX\perl.exe" # ${FileExists} is disabled for now to repair existing LyX installations using 64bit MiKTeX
# re-enable this for LyX 2.1.1
#${ifnot} ${FileExists} "$PathLaTeX\perl.exe"
SetOutPath "$PathLaTeXLocal" SetOutPath "$PathLaTeXLocal"
File /r ${FILES_MIKTEX} File /r ${FILES_MIKTEX}
# move the files to the correct location for 64bit # move the files to the correct location for 64bit
${if} $Is64bit == "true" ${if} $Is64bit == "true"
CopyFiles /SILENT /FILESONLY "$PathLaTeXLocal\miktex\bin\*.*" "$PathLaTeX" CopyFiles /SILENT /FILESONLY "$PathLaTeXLocal\miktex\bin\*.*" "$PathLaTeX"
CreateDirectory "$PathLaTeXLocal\miktex\bin\x64\lib" CreateDirectory "$PathLaTeXLocal\miktex\bin\x64\lib"
CopyFiles /SILENT "$PathLaTeXLocal\miktex\bin\lib\*.*" "$PathLaTeXLocal\miktex\bin\x64\lib" CopyFiles /SILENT "$PathLaTeXLocal\miktex\lib\*.*" "$PathLaTeXLocal\miktex\bin\x64\lib"
RMDir /r "$PathLaTeXLocal\miktex\bin\lib" RMDir /r "$PathLaTeXLocal\miktex\lib"
RMDir /r "$PathLaTeXLocal\miktex\bin\lib" # to clean up existing installations; can be removed for LyX 2.1.1
Delete "$PathLaTeXLocal\miktex\bin\*.*" Delete "$PathLaTeXLocal\miktex\bin\*.*"
${endif} ${endif}
${endif} #${endif}
${endif} ${endif}
# refresh MiKTeX's file name database (do this always to assure everything is in place) # refresh MiKTeX's file name database (do this always to assure everything is in place)