installer:

- fix installation of eLyXer
- install unoconv (fixes bug 7980)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40883 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index a95668aa17bc943ca7e5e4131b15c89f1be1fd87..9c01f218034dd87ed12e81ea77e725ccae5c4e9a 100644 (file)
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -14,6 +14,8 @@ Configuration of LyX installer
 !define FILES_PDFVIEW "${FILES_DEPS}\bin"
 !define FILES_MSVC "${FILES_DEPS}\bin"
 !define FILES_PYTHON "${FILES_DEPS}\python"
+!define FILES_ELYXER "${FILES_DEPS}\bin"
+!define FILES_UNOCONV "${FILES_DEPS}\bin"
 !define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
 !define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
 !define FILES_NETPBM "${FILES_DEPS}\bin"

diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index 24986f1026907dcf34e0ea485ab9b02255cff8e3..d36662b307604f5988a15c779dc9089d0ae9cdae 100644 (file)
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -59,6 +59,22 @@ Lists of files to include in the installer
   
 !macroend
 
+!macro FileListUnoConv COMMAND DIRECTORY
+
+  ${FILE}unoconv.py"
+  
+!macroend
+
+!macro FileListeLyXer COMMAND DIRECTORY
+
+  ${FILE}elyxer.py"
+  ${FILE}lyx.css"
+  ${FILE}math.css"
+  ${FILE}math2html.py"
+  ${FILE}toc.css"
+  
+!macroend
+
 !macro FileListPDFToolsBin COMMAND DIRECTORY
 
   ${FILE}pdfopen.exe"

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index b21a9f1fbdad0c93b7391dbad5b4e02c63824a7b..03ed48f9cfab6f732e12aa4800f441b2f448a629 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 0
 !define APP_VERSION_REVISION 3
-!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version
 
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display
 

diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index dd874674401e9a524bde3845a33bb18380072bf2..de678e856d7d7ab9231dddf59105daee6e65f98e 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -117,8 +117,13 @@ Section -ProgramFiles SecProgramFiles
    ${endif}
   !endif # end if BUNDLE
   
-   # install eLyXer as Python module
-   ExecWait '"$INSTDIR\python\python.exe" "$INSTDIR\python\setup.py" install'
+   # install eLyXer
+   SetOutPath "$INSTDIR\bin"
+   !insertmacro FileListeLyXer File "${FILES_ELYXER}\"
+   
+   # install unoconv
+   SetOutPath "$INSTDIR\python\Lib"
+   !insertmacro FileListUnoConv File "${FILES_UNOCONV}\"
 
   # install the LaTeX class files that are delivered with LyX
   # and enable MiKTeX's automatic package installation