anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-06-03 10:32:20 +02:00
commit 4e8644bc1d
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,10 +143,11 @@ FunctionEnd
# ------------------------------
Function ConfigureMiKTeX
# installs the LaTeX class files that are delivered with LyX
# installs the LaTeX class files that are delivered with LyX,
# a Perl interpreter for splitindex
# and enable MiKTeX's automatic package installation
# install LyX's LaTeX class and style files
# install LyX's LaTeX class and style files and a Perl interpreter
${if} $PathLaTeX != ""
${if} $MultiUser.Privileges != "Admin"
${orif} $MultiUser.Privileges != "Power"
@ -163,15 +164,22 @@ Function ConfigureMiKTeX
# LyX files in Resources\tex
SetOutPath "$PathLaTeXLocal\tex\latex\lyx"
CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" "$PathLaTeXLocal\tex\latex\lyx"
${endif}
# refresh MiKTeX's file name database
# only install a Perl interpreter if it is not already installed
${ifnot} ${FileExists} "$PathLaTeXLocal\miktex\bin\perl.exe"
SetOutPath "$PathLaTeXLocal"
File /r ${FILES_MIKTEX}
${endif}
# refresh MiKTeX's file name database (do this always to assure everything is in place)
${if} $MiKTeXUser != "HKCU" # call the admin version when the user is admin
nsExec::ExecToLog '"$PathLaTeX\initexmf --admin --update-fndb"'
${else}
nsExec::ExecToLog '"$PathLaTeX\initexmf --update-fndb"'
${endif}
Pop $UpdateFNDBReturn # Return value
${endif}
${endif}
# enable package installation without asking (1 = Yes, 0 = No, 2 = Ask me first)

1
development/Win32/packaging/installer/include/declarations.nsh
View File

@ -18,6 +18,7 @@ Configuration of LyX installer
!define FILES_UNOCONV "${FILES_DEPS}\bin"
!define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
!define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
!define FILES_MIKTEX "${FILES_DEPS}\miktex"
!define FILES_NETPBM "${FILES_DEPS}\bin"
!define FILES_DTL "${FILES_DEPS}\bin"
!define FILES_DVIPOST "${FILES_DEPS}\bin"