Win installer: add support for the program rsvg

also remove the now superfluous eLyXer addition
This commit is contained in:
Uwe Stöhr 2015-06-02 00:25:59 +02:00
parent 098f160fc0
commit cb20102701
4 changed files with 9 additions and 5 deletions

View File

@ -20,6 +20,7 @@ Configuration of LyX installer
!define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
!define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
!define FILES_NETPBM "${FILES_DEPS}\bin"
!define FILES_RSVG "${FILES_DEPS}\bin"
!define FILES_DTL "${FILES_DEPS}\bin"
!define FILES_DVIPOST "${FILES_DEPS}\bin"
!define FILES_DVIPOST_PKG "${FILES_DEPS}\tex"
@ -56,7 +57,7 @@ Configuration of LyX installer
!define APP_WEBPAGE_INFO "${APP_NAME} Website"
!define APP_WIKI "http://wiki.lyx.org"
!define APP_WIKI_INFO "${APP_NAME} Wiki"
!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2014 by the LyX Team"
!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2014 by the LyX Team"
!define APP_RUN "bin\lyx.exe"
!define BIN_LYX "lyx.exe"

View File

@ -65,6 +65,12 @@ Lists of files to include in the installer
!macroend
!macro FileListRsvg COMMAND DIRECTORY
${FILE}rsvg-convert.exe"
!macroend
!macro FileListDvipostBin COMMAND DIRECTORY
${FILE}pplatex.exe"

View File

@ -158,10 +158,6 @@ Section -Configure
FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
${endif}
# set path to eLyXer
FileWrite $R1 '\converter "lyx" "odt" "python -tt \"$INSTDIR\Python\Lib\elyxer.py\" --html --nofooter --unicode --directory $$$$r $$$$i $$$$o" ""$\r$\n\
\converter "lyx" "word" "python -tt \"$INSTDIR\Python\Lib\elyxer.py\" --html --nofooter --unicode --directory $$$$r $$$$i $$$$o" ""$\r$\n'
# use pdfview for all types of PDF files
FileWrite $R1 '\format "pdf5" "pdf" "PDF (LuaTeX)" "u" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n\
\format "pdf4" "pdf" "PDF (XeTeX)" "X" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n\

View File

@ -52,6 +52,7 @@ Section -ProgramFiles SecProgramFiles
!insertmacro FileListMSVC File "${FILES_MSVC}\"
!insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
!insertmacro FileListDTLBin File "${FILES_DTL}\"
!insertmacro FileListRsvg File "${FILES_RSVG}\"
!insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
!insertmacro FileListPDFViewBin File "${FILES_PDFVIEW}\"
!insertmacro FileListPDFToolsBin File "${FILES_PDFTOOLS}\"