Win installer: add support for the program rsvg

also remove the now superfluous eLyXer addition

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index d7fa43263080354842a7c29c609bc71c16aa762a..9be495351d137bf66cd2b6d84253bde3ece89acf 100644 (file)
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -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"

diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index 9f6c0a600f58036503f21401f63974e9f50ad34c..1aa009dfdd4ea50dac4fdf5a4b1b2b0631b4dd5d 100644 (file)
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -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"

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index f99d120fab2afa5f28a40f99207bde08cc7902f1..921f6ab6a38958dad48394d3392a7ed0784f6b5b 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -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\

diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index b34b52a06c3d559edb42492bfe28c1d1ff63febd..f3b38bfdcf07fc6c78aba8550d4eab1b37f45eb5 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -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}\"