Updated LyX/Windows installer

* MSVC 2005 compiler support
* Compatible with MiKTeX 2.5
* Updated for latest ImageMagick and Python
* Removed MSYS installation
* Improved multi-user installations
* Added separate user settings file
* Added German and French translation
* Fixed Norwegian LyX language support

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@15082 a592a061-630c-0410-9148-cb99ea01b6c8

INSTALL.Win32

@@ -1,7 +1,46 @@
-COMPILING LyX for Win32
+Compiling LyX 1.4 for Win32
-=======================
+===========================
 
-LyX 1.4 can be build with MinGW/MSYS. To compile LyX, follow these steps:
+LyX 1.4 can be compiled with Microsoft Visual C++ 2005 (recommended)
+or MinGW/MSYS.
+
+Compiling using MSVC 2005
+=========================
+
+1	Install MSVC 2005
+	
+	If you don't have MSVC 2005 installed, download and install the free
+	Express edition from http://msdn.microsoft.com/vstudio/express/visualc/
+	
+	You also need to install the Platform SDK, see
+	http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
+	
+2	Install Python
+	
+	Get the latest Python 2.5 version at
+	http://www.python.org/download/releases/2.5/
+	
+	Install in C:\Python25 and add this directory to the PATH environment
+	variable (Start > Settings > Control Panel > System > Advanced >
+	Environment Variables).
+	
+3	Install SCons
+	
+	Download and install SCons 0.96.92 from http://www.scons.org/download.php
+	
+4	Install the dependencies
+	
+	Download ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-msvc.zip
+	and extract in the root directory of your LyX files (so you will get
+	a directory called lyx-windows-deps-msvc next to the other directories
+	like src, development etc.).
+	
+5	Compile
+	
+	Run development\Win32\packaging\build_msvc.bat
+
+Compiling using MinGW/MSYS
+==========================
 
 1	Install a MSYS/MinGW environment
 	
@@ -13,12 +52,21 @@ LyX 1.4 can be build with MinGW/MSYS. To compile LyX, follow these steps:
 	Install MSYS in c:\msys and MinGW in c:\msys\mingw. When installing MinGW,
 	select the Candidate package and a Full installation.
 	
-2	Install the dependencies
+2	Install Python
+	
+	Get the latest Python 2.5 version at
+	http://www.python.org/download/releases/2.5/
+	
+	Install in C:\Python25 and add this directory to the PATH environment
+	variable (Start > Settings > Control Panel > System > Advanced >
+	Environment Variables).
+	
+3	Install the dependencies
 	
 	Download ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-mingw.zip
 	and extract in c:\msys
 	
-3	Compile
+4	Compile
 	
 	First, copy the LyX source code to c:\msys\home\lyx-14
 	
@@ -41,16 +89,15 @@ LyX 1.4 can be build with MinGW/MSYS. To compile LyX, follow these steps:
 	
 	Then follow step 3 again.
 
-4	Create the installer
+Creating the Installer
+======================
 	
 	To create an installer with LyX and all related components, download
-	and install the latest NSIS.
+	and install the latest NSIS from http://nsis.sourceforge.net
 	
-	Also download the latest Python from www.python.org and install in
+	Open development\Win32\packaging\installer\setttings.user.nsh and modify
-	C:\Python24
+	the settings depending on your build environment.
 	
-	Finally, go to C:\msys\home\lyx-14\development\Win32\packaging\installer
+	Finally, go to development\Win32\packaging\installer
 	(in a normal Windows Explorer), right-click on lyx.nsi and click
 	"Compile NSIS Script".
-
-	

development/Win32/packaging/build_msvc.bat

@@ -0,0 +1,2 @@
+cd ..\..\scons
+scons install prefix=..\..\build-msvc use_vc=yes frontend=qt2 mode=release version_suffix=1.4.x fast_start=no gettext=system nls=yes extra_inc_path=..\..\lyx14-windows-deps-msvc\include extra_lib_path=..\..\lyx14-windows-deps-msvc\lib extra_bin_path=..\..\lyx14-windows-deps-msvc\bin qt_dir=..\..\lyx14-windows-deps-msvc\qt-3

development/Win32/packaging/installer/components/core.nsh

@@ -14,73 +14,97 @@ Section -Core SecCore
 
   InitPluginsDir
   
+  ;Remove previous local MSYS installation
+  
+  RMDir /r "$INSTDIR\shell"
+  
+  ;Remove previous local Python files
+  
+  RMDir /r "$INSTDIR\python\DLLs"
+  RMDir /r "$INSTDIR\python\libs"
+  RMDir /r "$INSTDIR\python\python25.dll"  
+  
   ;Binaries
+  
   SetOutPath "$INSTDIR\bin"
   !insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
   !insertmacro FileListQtBin File "${FILES_QT}\bin\"
-  !insertmacro FileListMinGWBin File "${FILES_MINGW}\bin\"
-  !insertmacro FileListDllBin File "${FILES_DEPS}\bin\"
   
-  ;LaTeX Tools
+  !ifdef BUILD_MSVC
+    !insertmacro FileListDllMinGWBin Delete "$INSTDIR\bin\"
+    !insertmacro FileListMinGWBin Delete "$INSTDIR\bin\"
+    
+    !insertmacro FileListDllMSVCBin File "${FILES_DEPS}\bin\"
+    !insertmacro FileListMSVCBin File "${FILES_MSVC}\"
+  !else
+    !insertmacro FileListDllMSVCBin Delete "$INSTDIR\bin\"
+    !insertmacro FileListMSVCBin Delete "$INSTDIR\bin\"  
+    
+    !insertmacro FileListDllMinGWBin File "${FILES_DEPS}\bin\"
+    !insertmacro FileListMinGWBin File "${FILES_MINGW}\bin\" 
+  !endif
+
+  ;LaTeX tools
+  
   SetOutPath "$INSTDIR\latextools"
-  !insertmacro FileListNetpbmBin File "${FILES_DEPS}\bin\"
+  !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
-  !insertmacro FileListDvipostBin File "${FILES_DEPS}\bin\"
+  !insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
-  !insertmacro FileListDTLBin File "${FILES_DEPS}\bin\"
+  !insertmacro FileListDTLBin File "${FILES_DTL}\"
 
   ;Icons
+  
   SetOutPath "$INSTDIR\bin"
   !insertmacro FileListLyXIcons File "${FILES_ICONS}\"
 
   ;Resources
+  
   SetOutPath "$INSTDIR"
   File /r "${FILES_LYX}\Resources"
   SetOutPath "$INSTDIR\Resources\fonts"
   !insertmacro FileListFonts File "${FILES_FONTS}\"  
   
   ;Components of Python
+  
   SetOutPath "$INSTDIR\python"
   !insertmacro FileListPythonBin File "${FILES_PYTHON}\"
   SetOutPath "$INSTDIR\python"
-  !insertmacro FileListPythonDll File "${FILES_WINDOWS}\"
+  !insertmacro FileListPythonDll File "${FILES_WINDOWS}\System32\"
-  SetOutPath "$INSTDIR\python\DLLs"
-  !insertmacro FileListPythonDLLs File "${FILES_PYTHON}\DLLs\"
   SetOutPath "$INSTDIR\python\Lib"
   !insertmacro FileListPythonLib File "${FILES_PYTHON}\Lib\"
   SetOutPath "$INSTDIR\python\Lib\encodings"
   !insertmacro FileListPythonLibEncodings File "${FILES_PYTHON}\Lib\encodings\"
-  SetOutPath "$INSTDIR\python\libs"
-  !insertmacro FileListPythonLibs File "${FILES_PYTHON}\libs\"
-
-  ;Components of MSYS
-  SetOutPath "$INSTDIR\shell\bin"
-  !insertmacro FileListMSYSBin File "${FILES_MSYS}\bin\"
-  SetOutPath "$INSTDIR\shell\etc"
-  !insertmacro FileListMSYSEtc File "${FILES_MSYS}\etc\"     
   
   ;Aspell
 
-  File /oname=$PLUGINSDIR\AspellData-0.60.4.exe "${FILES_ASPELLDATA}\AspellData-0.60.4.exe"
+  File /oname=$PLUGINSDIR\aspelldata.exe "${FILES_ASPELLDATA}\aspelldata-sep06.exe"
 
   ${if} $AllUsersInstall == ${TRUE}
-    ExecWait '"$PLUGINSDIR\aspelldata-0.60.4.exe" /S /AllUsers'
+    ExecWait '"$PLUGINSDIR\aspelldata.exe" /S /AllUsers'
   ${else}
-    ExecWait '"$PLUGINSDIR\aspelldata-0.60.4.exe" /S'
+    ExecWait '"$PLUGINSDIR\aspelldata.exe" /S'
   ${endif}
 
-  Delete "$PLUGINSDIR\aspelldata-0.60.4.exe"
+  Delete "$PLUGINSDIR\aspelldata.exe"
+
+  ;Aiksarus data
   
-  ;Aiksarus Data
   SetOutPath "$INSTDIR\aiksaurus"
-  !insertmacro FileListAiksaurusData File "${FILES_DEPS}\share\Aiksaurus\"
+  !insertmacro FileListAiksaurusData File "${FILES_AIKSAURUS}\"
   
-  ;dvipost package if MiKTeX is installed
+  ;dvipost package
 
   Call SearchLaTeXLocalRoot
   Pop $R0
 
   ${if} $R0 != ""
     SetOutPath "$R0\tex\latex\dvipost"
-    File "${FILES_DVIPOST}\dvipost.sty"
+    File "${FILES_DVIPOST_PKG}\dvipost.sty"
+  ${endif}
+  
+  ;Update file name database
+  
+  ${if} $PathLaTeX != ""
+    nsExec::Exec '"$PathLaTeX\initexmf.exe" --update-fndb'
   ${endif}
 
 SectionEnd

development/Win32/packaging/installer/components/langselect.nsh

@@ -36,8 +36,8 @@ Selection of language for LyX interface
   ${LANGCODE} "German" "de_DE"
   ${LANGCODE} "Hungarian" "hu_HU"
   ${LANGCODE} "Italian" "it_IT"
-  ${LANGCODE} "Norwegian" "no_NO"
+  ${LANGCODE} "Norwegian" "nb_NO"
-  ${LANGCODE} "Norwegian (Nynorsk)" "no_NY"
+  ${LANGCODE} "Norwegian (Nynorsk)" "nn_NO"
   ${LANGCODE} "Polish" "pl_PL"
   ${LANGCODE} "Romanish" "ro_RO"
   ${LANGCODE} "Russian" "ru_RU"

development/Win32/packaging/installer/components/uninstall.nsh

@@ -10,54 +10,50 @@ Uninstaller
 Section "un.Program Files" un.SecProgramFiles
 
   ;Binaries
+  
   !insertmacro FileListLyXBin Delete "$INSTDIR\bin\"
   !insertmacro FileListQtBin Delete "$INSTDIR\bin\"
   !insertmacro FileListMinGWBin Delete "$INSTDIR\bin\"
-  !insertmacro FileListDllBin Delete "$INSTDIR\bin\"
+  
+  !ifdef BUILD_MSVC
+    !insertmacro FileListDllMSVCBin Delete "$INSTDIR\bin\"
+    !insertmacro FileListMSVCBin Delete "$INSTDIR\bin\"
+  !else
+    !insertmacro FileListDllMinGWBin Delete "$INSTDIR\bin\"
+    !insertmacro FileListMinGWBin Delete "$INSTDIR\bin\"
+  !endif
 
   ;LaTeX Tools
+  
   !insertmacro FileListNetpbmBin Delete "$INSTDIR\latextools\"
   !insertmacro FileListDvipostBin Delete "$INSTDIR\latextools\"
   !insertmacro FileListDTLBin Delete "$INSTDIR\latextools\"
   RMDir "$INSTDIR\latextools"
   
   ;Icons
+  
   !insertmacro FileListLyXIcons Delete "$INSTDIR\bin\"  
   
   ;Resources
+  
   RMDir /r "$INSTDIR\Resources"
   
   ;Components of Python
-  !insertmacro FileListPythonBin Delete "$INSTDIR\python\"
-  !insertmacro FileListPythonDll Delete "$INSTDIR\python\"
-  !insertmacro FileListPythonDLLs Delete "$INSTDIR\python\DLLs\"
-  RMDir "$INSTDIR\python\DLLs"
-  !insertmacro FileListPythonLib Delete "$INSTDIR\python\Lib\"
-  Delete "$INSTDIR\python\Lib\*.pyc"
-  !insertmacro FileListPythonLibEncodings Delete "$INSTDIR\python\Lib\encodings\"
-  Delete "$INSTDIR\python\Lib\encodings\*.pyc"
-  RMDir "$INSTDIR\python\Lib\encodings"
-  RMDir "$INSTDIR\python\Lib"
-  !insertmacro FileListPythonLibs Delete "$INSTDIR\python\libs\"
-  RMDir "$INSTDIR\python\libs"
-  RMDir "$INSTDIR\python"
   
-  ;Components of MSYS
+  RMDir /r "$INSTDIR\python"
-  !insertmacro FileListMSYSBin Delete "$INSTDIR\shell\bin\"
-  RMDir "$INSTDIR\shell\bin"
-  !insertmacro FileListMSYSEtc Delete "$INSTDIR\shell\etc\"
-  RMDir "$INSTDIR\shell\etc"  
-  RMDir "$INSTDIR\shell"
   
   ;Aiksaurus Data
+  
   !insertmacro FileListAiksaurusData Delete "$INSTDIR\aiksaurus\"
   RMDir "$INSTDIR\aiksaurus"
   
   ;Shortcuts
+  
   Delete "$SMPROGRAMS\${APP_NAME} ${APP_SERIES_NAME}.lnk"
   Delete "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk"
 
   ;Batch file and uninstaller itself
+  
   Delete "$INSTDIR\${APP_RUN}"
   Delete "$INSTDIR\${SETUP_UNINSTALLER}"
   RMDir "$INSTDIR\bin"
@@ -66,12 +62,14 @@ Section "un.Program Files" un.SecProgramFiles
   RMDir "$INSTDIR"
   
   ;Remove registry keys
+  
   DeleteRegKey SHELL_CONTEXT "${APP_REGKEY_SETUP}"
   DeleteRegKey SHELL_CONTEXT "${APP_REGKEY}"
   DeleteRegKey SHELL_CONTEXT "Software\Classes\${APP_REGNAME_DOC}"
   DeleteRegKey SHELL_CONTEXT "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"
   
   ;Remove file association
+  
   ReadRegStr $R0 SHELL_CONTEXT "Software\Classes\${APP_EXT}" ""
   
   ${if} $R0 == "${APP_REGNAME_DOC}"

development/Win32/packaging/installer/include/declarations.nsh

@@ -4,6 +4,7 @@ Declarations
 
 */
 
+!include "settings.user.nsh"
 !include "settings.nsh"
 
 ;--------------------------------
@@ -78,6 +79,7 @@ Var AspellHive
 
 !insertmacro GetParent
 !insertmacro VersionCompare
+!insertmacro WordFind2X
 
 ;--------------------------------
 ;Macros  

development/Win32/packaging/installer/include/detection.nsh

@@ -7,9 +7,25 @@ Detection functions for all components
 ;--------------------------------
 ;Macros
 
-!macro SearchMiKTeX rootkey
+!macro SearchMiKTeX25
 
-  ReadRegStr $PathLaTeX ${rootkey} "Software\MiK\MiKTeX\CurrentVersion\MiKTeX" "Install Root"
+  ;Detect location of MiKTeX installation using initexmf
+  
+  Push $R0
+  
+  nsExec::ExecToStack "initexmf.exe --report"
+  Pop $R0 ;Return value
+  Pop $R0 ;Output
+  
+  ${WordFind2X} $R0 "BinDir: " "$\r" "+1" $PathLaTeX
+  
+  Pop $R0
+
+!macroend
+
+!macro SearchMiKTeX24 ROOTKEY
+
+  ReadRegStr $PathLaTeX ${ROOTKEY} "Software\MiK\MiKTeX\CurrentVersion\MiKTeX" "Install Root"
   
   ${if} $PathLaTeX != ""
     !insertmacro callfunc TrimBackslash $PathLaTeX $PathLaTeX ;Just in case it's installed in a root directory
@@ -18,6 +34,41 @@ Detection functions for all components
   
 !macroend
 
+!macro IfKeyExists ROOT MAIN_KEY KEY
+
+  Push $R0
+  Push $R1
+ 
+  !define Index 'Line${__LINE__}'
+ 
+  StrCpy $R1 0
+ 
+  "${Index}-Loop:"
+  ;Check for key
+  EnumRegKey $R0 ${ROOT} "${MAIN_KEY}" "$R1"
+  StrCmp $R0 "" "${Index}-False"
+  IntOp $R1 $R1 + 1
+  StrCmp $R0 "${KEY}" "${Index}-True" "${Index}-Loop"
+ 
+  "${Index}-True:"
+  ;Found
+  Push ${TRUE}
+  Goto "${Index}-End"
+ 
+  "${Index}-False:"
+  ;Not found
+  Push ${FALSE}
+  goto "${Index}-End"
+ 
+  "${Index}-End:"
+  !undef Index
+  
+  Exch 2
+  Pop $R0
+  Pop $R1
+
+!macroend
+
 ;--------------------------------
 ;Functions
 
@@ -56,7 +107,7 @@ Function GetPathPrefix
 
   Push $R0
 
-  StrCpy $R0 "$INSTDIR\latextools;$INSTDIR\python;$INSTDIR\shell\bin"
+  StrCpy $R0 "$INSTDIR\bin;$INSTDIR\latextools;$INSTDIR\python"
   
   ${if} $PathLaTeX != ""
     StrCpy $R0 "$R0;$PathLaTeX"
@@ -125,12 +176,14 @@ Function SearchLaTeX
 
   ;Search where MikTeX is installed
   
-  ;Current user
+  !insertmacro SearchMiKTeX25
-  !insertmacro SearchMiKTeX HKCU
   
-  ;All users
   ${unless} ${FileExists} "$PathLaTeX\${BIN_LATEX}"
-    !insertmacro SearchMiKTeX HKLM
+    !insertmacro SearchMiKTeX24 HKCU
+  ${endif}
+
+  ${unless} ${FileExists} "$PathLaTeX\${BIN_LATEX}"
+    !insertmacro SearchMiKTeX24 HKLM
   ${endif}
 
   ${unless} ${FileExists} "$PathLaTeX\${BIN_LATEX}"
@@ -141,17 +194,33 @@ FunctionEnd
 
 Function SearchLaTeXLocalRoot
 
-  ;Search for the MikTeX local root (localtexmf)
+  ;Search for the MikTeX local root
   ;Returns value on stack
 
   Push $R0
   
-  ;Current user
+  ;MikTeX 2.5
-  ReadRegStr $R0 HKCU "Software\MiK\MiKTeX\CurrentVersion\MiKTeX" "Local Root"
+  
+  !insertmacro IfKeyExists HKCU "Software\MiKTeX.org\MiKTeX" "2.5"
+  Pop $R0
+  
+  ${if} $R0 == ${FALSE}
+    !insertmacro IfKeyExists HKLM "Software\MiKTeX.org\MiKTeX" "2.5"
+    Pop $R0
+  ${endif}
+  
+  ${if} $R0 == ${TRUE}
+    StrCpy $R0 "$APPDATA\MiKTeX\2.5"
+  ${else}
+  
+    ;MiKTeX 2.4
+    
+    ReadRegStr $R0 HKCU "Software\MiK\MiKTeX\CurrentVersion\MiKTeX" "Local Root"
+    
+    ${unless} ${FileExists} $R0
+      ReadRegStr $R0 HKLM "Software\MiK\MiKTeX\CurrentVersion\MiKTeX" "Local Root"
+    ${endif}
     
-  ;All users
-  ${unless} ${FileExists} $R0
-    ReadRegStr $R0 HKLM "Software\MiK\MiKTeX\CurrentVersion\MiKTeX" "Local Root"
   ${endif}
   
   Exch $R0

development/Win32/packaging/installer/include/filelists.nsh

@@ -30,19 +30,36 @@ Lists of files to include in the installer
 
 !macroend
 
+!macro FileListMSVCBin COMMAND DIRECTORY
+
+  ${COMMAND} "${DIRECTORY}msvcr80.dll"
+  ${COMMAND} "${DIRECTORY}msvcp80.dll"
+  
+!macroend
+
 !macro FileListMinGWBin COMMAND DIRECTORY
 
   ${COMMAND} "${DIRECTORY}mingwm10.dll"
   
 !macroend
 
-!macro FileListDllBin COMMAND DIRECTORY
+!macro FileListDllMSVCBin COMMAND DIRECTORY
+
+  ${COMMAND} "${DIRECTORY}iconv.dll"
+  ${COMMAND} "${DIRECTORY}intl.dll"
+  ${COMMAND} "${DIRECTORY}aspell.dll"
+  ${COMMAND} "${DIRECTORY}Aiksaurus.dll"
+  ${COMMAND} "${DIRECTORY}zlib1.dll"
+
+!macroend
+
+!macro FileListDllMinGWBin COMMAND DIRECTORY
 
   ${COMMAND} "${DIRECTORY}libiconv-2.dll"
   ${COMMAND} "${DIRECTORY}libintl-3.dll"
-  ${COMMAND} "${DIRECTORY}zlib1.dll"
   ${COMMAND} "${DIRECTORY}libAiksaurus-1-2-0.dll"
   ${COMMAND} "${DIRECTORY}libaspell-15.dll"
+  ${COMMAND} "${DIRECTORY}zlib1.dll"
 
 !macroend
 
@@ -85,35 +102,6 @@ Lists of files to include in the installer
   
 !macroend
 
-!macro FileListMSYSBin COMMAND DIRECTORY
-
-  ${COMMAND} "${DIRECTORY}cat.exe"
-  ${COMMAND} "${DIRECTORY}cp.exe"
-  ${COMMAND} "${DIRECTORY}cut.exe"
-  ${COMMAND} "${DIRECTORY}expr.exe"
-  ${COMMAND} "${DIRECTORY}find.exe"
-  ${COMMAND} "${DIRECTORY}grep.exe"
-  ${COMMAND} "${DIRECTORY}ln.exe"
-  ${COMMAND} "${DIRECTORY}ls.exe"
-  ${COMMAND} "${DIRECTORY}mkdir.exe"
-  ${COMMAND} "${DIRECTORY}mv.exe"
-  ${COMMAND} "${DIRECTORY}rm.exe"
-  ${COMMAND} "${DIRECTORY}sed.exe"
-  ${COMMAND} "${DIRECTORY}sh.exe"
-  ${COMMAND} "${DIRECTORY}touch.exe"
-  ${COMMAND} "${DIRECTORY}tr.exe"
-  ${COMMAND} "${DIRECTORY}uname.exe"
-  ${COMMAND} "${DIRECTORY}MSYS-1.0.dll"
-
-!macroend
-
-!macro FileListMSYSEtc COMMAND DIRECTORY
-
-  ${COMMAND} "${DIRECTORY}config.site"
-  ${COMMAND} "${DIRECTORY}profile"
-
-!macroend
-
 !macro FileListPythonBin COMMAND DIRECTORY
 
   ${COMMAND} "${DIRECTORY}python.exe"
@@ -122,13 +110,7 @@ Lists of files to include in the installer
 
 !macro FileListPythonDll COMMAND DIRECTORY
 
-  ${COMMAND} "${DIRECTORY}python24.dll"
+  ${COMMAND} "${DIRECTORY}python25.dll"
-
-!macroend
-
-!macro FileListPythonDLLs COMMAND DIRECTORY
-
-  ${COMMAND} "${DIRECTORY}zlib.pyd"
 
 !macroend
 
@@ -157,6 +139,7 @@ Lists of files to include in the installer
   ${COMMAND} "${DIRECTORY}sre_parse.py"
   ${COMMAND} "${DIRECTORY}stat.py"
   ${COMMAND} "${DIRECTORY}string.py"
+  ${COMMAND} "${DIRECTORY}struct.py"  
   ${COMMAND} "${DIRECTORY}tempfile.py"
   ${COMMAND} "${DIRECTORY}tempfile.py"
   ${COMMAND} "${DIRECTORY}types.py"
@@ -173,12 +156,6 @@ Lists of files to include in the installer
   
 !macroend
 
-!macro FileListPythonLibs COMMAND DIRECTORY
-
-  ${COMMAND} "${DIRECTORY}zlib.lib"
-
-!macroend
-
 !macro FileListAiksaurusData COMMAND DIRECTORY
 
   ${COMMAND} "${DIRECTORY}words.dat"

development/Win32/packaging/installer/include/gui.nsh

@@ -170,9 +170,14 @@ FunctionEnd
 Function InitInterface
 
   Call CheckPriviledges
+
+  Banner::show /NOUNLOAD "Preparing wizard"
+
   Call InitDialogs
   Call InitLanguage  
   Call InitSizeExternal
   Call InitSizeViewer
   
+  Banner::destroy
+
 FunctionEnd

development/Win32/packaging/installer/include/windows.nsh

@@ -67,14 +67,24 @@ Function un.SetShellContext
   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}" "UninstallString"
   
   ${if} $R0 != ""
-    ${if} $AdminOrPowerUser == ${FALSE}
+  
-      MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} has been installed for all users. Therefore you need Administrator or Power User Priviledges to uninstall."
+    ReadRegStr $R0 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}" "UninstallString"
-      Quit
+
-    ${else}
+    ${if} $R0 != ""
-      SetShellVarContext all
+    
+      ${if} $AdminOrPowerUser == ${FALSE}
+        MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} has been installed for all users. Therefore you need Administrator or Power User Priviledges to uninstall."
+        Quit
+      ${else}
+        SetShellVarContext all
+      ${endif}
+      
     ${endif}
+    
   ${else}
+  
     SetShellVarContext current
+  
   ${endif}
   
   Pop $R0

development/Win32/packaging/installer/lang/english.nsh

@@ -6,13 +6,13 @@ Author: Joost Verburg
 
 */
 
-!insertmacro LanguageString TEXT_NO_PRIVILEDGES "You do not have Administrator or Power User priviledges.$\r$\n$\r$\nAlthough you can install ${APP_NAME} and the typesetting system, the utilities for image conversion and previewing cannot be installed without these priviledges."
+!insertmacro LanguageString TEXT_NO_PRIVILEDGES "You do not have Administrator or Power User privileges.$\r$\n$\r$\nAlthough you can install ${APP_NAME} and the typesetting system, the utilities for image conversion and previewing cannot be installed without these priviledges."
 
 !insertmacro LanguageString TEXT_WELCOME_DOWNLOAD "This wizard will guide you through the installation of $(^NameDA), the document processor that encourages an approach to writing based on the structure of your documents, not their appearance.\r\n\r\nThis installer will setup a complete environment to use ${APP_NAME} and can download missing components automatically.\r\n\r\n$(^ClickNext)"
 !insertmacro LanguageString TEXT_WELCOME_INSTALL "This wizard will guide you through the installation of $(^NameDA), the document processor that encourages an approach to writing based on the structure of your documents, not their appearance.\r\n\r\nThis installer will setup a complete environment to use ${APP_NAME} and can install missing components automatically.\r\n\r\n$(^ClickNext)"
 
 !insertmacro LanguageString TEXT_USER_TITLE "Choose Users"
-!insertmacro LanguageString TEXT_USER_SUBTITLE "Choose for which users want to install $(^NameDA)."
+!insertmacro LanguageString TEXT_USER_SUBTITLE "Choose for which users you want to install $(^NameDA)."
 !insertmacro LanguageString TEXT_USER_INFO "Select whether want to install $(^NameDA) for yourself only or for all users on this sytem. $(^ClickNext)"
 !insertmacro LanguageString TEXT_USER_CURRENT "Install just for me"
 !insertmacro LanguageString TEXT_USER_ALL "Install for anyone using this computer"
@@ -22,7 +22,7 @@ Author: Joost Verburg
 !insertmacro LanguageString TEXT_REINSTALL_INFO "$(^NameDA) is already installed. This installer will allow you to change the interface language, locations of external applications or download additional dictionaries. If you also want to reinstall the program files, check the box below. $(^ClickNext)"
 !insertmacro LanguageString TEXT_REINSTALL_ENABLE "Reinstall $(^NameDA) program files"
 
-!insertmacro LanguageString TEXT_EXTERNAL_NOPRIVILEDGES "(Administrator or Power User priviledges required)"
+!insertmacro LanguageString TEXT_EXTERNAL_NOPRIVILEDGES "(Administrator or Power User privileges required)"
 
 !insertmacro LanguageString TEXT_EXTERNAL_LATEX_TITLE "LaTeX Typesetting System"
 !insertmacro LanguageString TEXT_EXTERNAL_LATEX_SUBTITLE "A typesetting system is required to be able to create documents for printing or publishing."
@@ -66,7 +66,7 @@ Author: Joost Verburg
 
 !insertmacro LanguageString TEXT_DICT_TITLE "Spell Checker Dictionaries"
 !insertmacro LanguageString TEXT_DICT_SUBTITLE "Choose the languages you want the spell checker to support."
-!insertmacro LanguageString TEXT_DICT_TOP "In order to spell check documents in a certain language, a dictionary with valid words needs to be downloaded. Select the dictionaries to download. $_CLICK"
+!insertmacro LanguageString TEXT_DICT_TOP "In order to spell check documents in a certain language, a dictionary with valid words has to be downloaded. Select the dictionaries to download. $_CLICK"
 !insertmacro LanguageString TEXT_DICT_LIST "Select dictionaries to download:"
 
 !insertmacro LanguageString TEXT_LANGUAGE_TITLE "Choose Language"
@@ -80,7 +80,7 @@ Author: Joost Verburg
 !insertmacro LanguageString TEXT_DOWNLOAD_FAILED_DICT "Failed to download the ${DICT_NAME} spell checker dictionary. Would you like to try again?"
 
 !insertmacro LanguageString TEXT_NOTINSTALLED_LATEX "The MiKTeX setup wizard was not completed. Do you want to run MiKTeX setup again?"
-!insertmacro LanguageString TEXT_NOTINSTALLED_IMAGEMAGICK "TheImageMagick was not completed. Do you want to run ImageMagick setup again?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_IMAGEMAGICK "The ImageMagick was not completed. Do you want to run ImageMagick setup again?"
 !insertmacro LanguageString TEXT_NOTINSTALLED_GHOSTSCRIPT "The Ghostscript setup wizard was not completed. Do you want to run Ghostscript setup again?"
 !insertmacro LanguageString TEXT_NOTINSTALLED_VIEWER "You did not associate GSView with the PDF/Postscript file types. Do you want to run GSView setup again?"
 !insertmacro LanguageString TEXT_NOTINSTALLED_DICT "The setup wizard of the ${DICT_NAME} spell checker dictionary was not completed. Do you want to run the setup again?"

development/Win32/packaging/installer/lang/french.nsh

@@ -0,0 +1,91 @@
+/*
+
+LyX Installer Language File
+Language: French
+Author: Jean-Pierre Chrétien
+
+*/
+
+!insertmacro LanguageString TEXT_NO_PRIVILEDGES "Vous n'avez pas les privilèges d'administrateur.$\r$\n$\r$\nBien que vous puissiez installer ${APP_NAME} et le système typographique, les utilitaires de conversion de format graphique et de prévisualisation ne peuvent être installés sans ces privilèges."
+
+!insertmacro LanguageString TEXT_WELCOME_DOWNLOAD "Cet assistant va vous guider tout au long de l'installation de $(^NameDA), le constructeur de documents qui encourage une saisie fondée sur la structure du document plutôt que sur son apparence.\r\n\r\nCet assistant d'installation va paramétrer un environnement complet d'utilisation de ${APP_NAME} et peut télécharger automatiquement les composants manquants.\r\n\r\n$(^ClickNext)"
+!insertmacro LanguageString TEXT_WELCOME_INSTALL "Cet assistant va vous guider tout au long de l'installation de $(^NameDA), le constructeur de documents qui encourage une saisie fondée sur la structure du document plutôt que sur son apparence.\r\n\r\nCet assistant d'installation va paramétrer un environnement complet d'utilisation de ${APP_NAME} et peut installer automatiquement les composants manquants.\r\n\r\n$(^ClickNext)"
+
+!insertmacro LanguageString TEXT_USER_TITLE "Choix des utilisateurs"
+!insertmacro LanguageString TEXT_USER_SUBTITLE "Sélection des utilisateurs désirant utiliser $(^NameDA)."
+!insertmacro LanguageString TEXT_USER_INFO "Choix entre installer $(^NameDA) seulement pour vous-même  ou bien pour tous les utilisateurs du système. $(^ClickNext)"
+!insertmacro LanguageString TEXT_USER_CURRENT "Installer seulement pour moi."
+!insertmacro LanguageString TEXT_USER_ALL "Installer pour tous les utilisateurs."
+
+!insertmacro LanguageString TEXT_REINSTALL_TITLE "Réinstallation"
+!insertmacro LanguageString TEXT_REINSTALL_SUBTITLE "Réinstallation éventuelle des fichiers programmes de $(^NameDA)."
+!insertmacro LanguageString TEXT_REINSTALL_INFO "$(^NameDA) est déjà installé. Cet assistant vous permettra de modifier le langage de l'interface ou l'emplacement des applications externes, ou de télécharger de nouveaux dictionnaires. Si vous souhaitez réinstaller aussi les fichiers programmes, cochez la case ci-dessous. $(^ClickNext)"
+!insertmacro LanguageString TEXT_REINSTALL_ENABLE "Réinstaller les fichiers programmes $(^NameDA)"
+
+!insertmacro LanguageString TEXT_EXTERNAL_NOPRIVILEDGES "(Privilèges d'administration requis)"
+
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_TITLE "Système typographique LaTeX"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_SUBTITLE "Un système typographique est requis pour pouvoir créer des documents imprimables ou publiables."
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_INFO_DOWNLOAD "Merci de préciser si vous désirez télécharger MikTeX ou si vous voulez utiliser une distribution LaTeX existante. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_INFO_INSTALL "Merci de préciser si vous désirez installer MikTeX ou si vous voulez utiliser une distribution LaTeX existante. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_DOWNLOAD "Télécharger MikTeX"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_INSTALL "Installer MikTeX"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_FOLDER "Utiliser une distribution LaTeX existante dans le répertoire suivant :"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_FOLDER_INFO "Ce répertoire doit contenir ${BIN_LATEX}."
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_NONE "Installer sans distribution LaTeX (non recommandé)"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_NOTFOUND "${BIN_LATEX} n'existe pas dans le répertoire spécifié."
+
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_TITLE "ImageMagick"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_SUBTITLE "ImageMagick est requis pour les conversions de formats graphiques variés."
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_INFO_DOWNLOAD "Merci de préciser si vous désirez télécharger ImageMagick ou si vous en disposez déjà. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_INFO_INSTALL "Merci de préciser si vous désirez installer ImageMagick ou si vous en disposez déjà. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_DOWNLOAD "Télécharger ImageMagick"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_INSTALL "Installer ImageMagick"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_FOLDER "Utiliser une installation ImageMagick existante dans le répertoire suivant :"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_FOLDER_INFO "Ce répertoire doit contenir ${BIN_IMAGEMAGICK}."
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_NONE "Installer sans ImageMagick (non recommandé)"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_NOTFOUND "${BIN_IMAGEMAGICK} n'existe pas dans le répertoire spécifié."
+
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_TITLE "Ghostscript"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_SUBTITLE "Ghostscript est requis pour prévisualiser les documents au format PostScript."
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_INFO_DOWNLOAD "Merci de préciser si vous désirez télécharger Ghostscript ou si vous en disposez déjà. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_INFO_INSTALL "Merci de préciser si vous désirez installer Ghostscript ou si vous en disposez déjà. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_DOWNLOAD "Télécharger Ghostscript"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_INSTALL "Installer Ghostscript"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_FOLDER "Utiliser une installation Ghostscript existante dans le répertoire suivant :"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_FOLDER_INFO "Ce répertoire doit contenir ${BIN_GHOSTSCRIPT}."
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_NONE "Installer sans GhostScript (non recommandé)"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_NOTFOUND "${BIN_GHOSTSCRIPT} n'existe pas dans le répertoire spécifié."
+
+!insertmacro LanguageString TEXT_VIEWER_TITLE "Visualisation des documents"
+!insertmacro LanguageString TEXT_VIEWER_SUBTITLE "Un afficheur est requis pour présenter les résultats des traitements à l'écran."
+!insertmacro LanguageString TEXT_VIEWER_INFO_DOWNLOAD "Il n'y a pas d'afficheur installé sur votre système pour prévisualiser les fichiers PDF et PostScript , formats courants de la version typographique des documents. Si vous cochez la case ci-dessous, l'afficheur PDF/PostScript Gaviez sera téléchargé. $_CLICK"
+!insertmacro LanguageString TEXT_VIEWER_INFO_INSTALL "Il n'y a pas d'afficheur installé sur votre système pour prévisualiser les fichiers PDF et PostScript , formats courants de la version typographique des documents. Si vous cochez la case ci-dessous, l'afficheur PDF/PostScript GSView sera installé. $_CLICK"
+!insertmacro LanguageString TEXT_VIEWER_DOWNLOAD "Télécharger GSView"
+!insertmacro LanguageString TEXT_VIEWER_INSTALL "Installer GSView"
+
+!insertmacro LanguageString TEXT_DICT_TITLE "Dictionnaires orthographiques"
+!insertmacro LanguageString TEXT_DICT_SUBTITLE "Sélection des langues pour lesquelles vous désirez un dictionnaire orthographique."
+!insertmacro LanguageString TEXT_DICT_TOP "Pour vérifier l'orthographe des documents dans un langage donné, un dictionnaire contenant les mots admis dot être téléchargé. Sélectionner les dictionnaires à télécharger. $_CLICK"
+!insertmacro LanguageString TEXT_DICT_LIST "Sélectionner les dictionnaires à télécharger :"
+
+!insertmacro LanguageString TEXT_LANGUAGE_TITLE "Choix de la langue"
+!insertmacro LanguageString TEXT_LANGUAGE_SUBTITLE "Choix de la langue de l'interface $(^NameDA)."
+!insertmacro LanguageString TEXT_LANGUAGE_INFO "Sélectionner la langue à utiliser dans l'interface ${APP_NAME}. $(^ClickNext)"
+
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_LATEX "Le téléchargement de MikTeX a échoué. Voulez-vous réessayer ?"
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_IMAGEMAGICK "Le téléchargement de ImageMagick a échoué. Voulez-vous réessayer ?"
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_GHOSTSCRIPT "Le téléchargement de Ghostscript a échoué. Voulez-vous réessayer ?"
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_VIEWER "Le téléchargement de GSView a échoué. Voulez-vous réessayer ?"
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_DICT "Le téléchargement du dictionnaire orthographique ${DICT_NAME} a échoué. Voulez-vous réessayer ?"
+
+!insertmacro LanguageString TEXT_NOTINSTALLED_LATEX "L'installation de MikTeX est restée incomplète. Voulez-vous relancer l'installation de MikTeX ?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_IMAGEMAGICK "L'installation de ImageMagick est restée incomplète. Voulez-vous relancer l'installation de ImageMagick ?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_GHOSTSCRIPT "L'installation de Ghostscript est restée incomplète. Voulez-vous relancer l'installation de Ghostscript ?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_VIEWER "Vous n'avez pas associé GSView aux types de fichier PDF/PostScript. Voulez-vous relancer l'installation de GSView ?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_DICT "L'installation du dictionnaire orthographique ${DICT_NAME} est restée incomplète. Voulez-vous relancer l'installation ?"
+
+!insertmacro LanguageString TEXT_FINISH_DESKTOP "Créer un raccourci sur le bureau"
+!insertmacro LanguageString TEXT_FINISH_WEBSITE "Consulter les dernières nouvelles, trucs et astuces sur le site lyx.org"
+
+!insertmacro LanguageString UNTEXT_WELCOME "Cet assistant va vous guider tout au long de la désinstallation de $(^NameDA). Merci de quitter $(^NameDA) avant de poursuivre.\r\n\r\nNotez bien que cet assistant ne désinstallera que LyX proprement dit. Si vous désirez désinstaller d'autres applications que vous avez installées pour les besoins de $(^NameDA), effectuez cette désinstallation via la page « Ajout/Suppression de programmes ».\r\n\r\n$_CLICK"

development/Win32/packaging/installer/lang/german.nsh

@@ -0,0 +1,91 @@
+/*
+
+LyX Installer Language File
+Language: German
+Author: Andreas Deininger
+
+*/
+
+!insertmacro LanguageString TEXT_NO_PRIVILEDGES "Sie gehören weder der Gruppe der Administratoren noch der Gruppe der Hauptbenutzer an.$\r$\n$\r$\nSie können zwar ${APP_NAME} installieren und ebenso auch das Satzprogramm. Die Werkzeuge zur Grafikkonvertierung und für die Vorschau können jedoch ohne diese Rechte nicht installiert werden."
+
+!insertmacro LanguageString TEXT_WELCOME_DOWNLOAD "Dieses Installationsprogramm wird Sie durch die Installation von $(^NameDA) leiten, des Dokumentenverarbeitungsprogramms welches das Verfassen von Texten basierend auf ihrer Struktur unterstützt, nicht das Verfassen von Texten ausgerichtet auf ihr Erscheinungsbild.\r\n\r\nDieses Installationsprogramm wird ein Komplettsystem zur Nutzung von ${APP_NAME} auf Ihrem Rechner erzeugen, dabei können fehlende Komponenten automatisch heruntergeladen werden.\r\n\r\n$(^ClickNext)"
+!insertmacro LanguageString TEXT_WELCOME_INSTALL "Dieses Installationsprogramm wird Sie durch die Installation von $(^NameDA) leiten, des Dokumentenverarbeitungsprogramms welches das Verfassen von Texten basierend auf ihrer Struktur unterstützt, nicht das Verfassen von Texten ausgerichtet auf ihr Erscheinungsbild.\r\n\r\nDieses Installationsprogramm wird ein Komplettsystem zur Nutzung von ${APP_NAME} auf Ihrem Rechner erzeugen, dabei können fehlende Komponenten automatisch heruntergeladen werden.\r\n\r\n$(^ClickNext)"
+
+!insertmacro LanguageString TEXT_USER_TITLE "Benutzer auswählen"
+!insertmacro LanguageString TEXT_USER_SUBTITLE "Wählen Sie die Benutzer aus, für die Sie $(^NameDA) installieren wollen."
+!insertmacro LanguageString TEXT_USER_INFO "Wählen Sie aus, ob Sie $(^NameDA) nur für den eigenen Gebrauch oder für die Nutzung durch alle Benutzer dieses Systems installieren möchten. $(^ClickNext)"
+!insertmacro LanguageString TEXT_USER_CURRENT "Installation nur für mich"
+!insertmacro LanguageString TEXT_USER_ALL "Installation für alle Benutzer dieses Computers"
+
+!insertmacro LanguageString TEXT_REINSTALL_TITLE "Erneute Installation"
+!insertmacro LanguageString TEXT_REINSTALL_SUBTITLE "Wählen Sie aus, ob Sie die $(^NameDA) Programmdateien erneut installieren möchten."
+!insertmacro LanguageString TEXT_REINSTALL_INFO "$(^NameDA) ist bereits installiert. Das Installationsprogramm gestattet Ihnen die Spracheinstellungen der Benutzeroberfläche oder den Ort externer Anwendungen abzuändern, ferner können Sie zusätzliche Wörterbücher herunterladen. Falls Sie die Programmdateien erneut installieren möchten, markieren Sie das untenstehende Kästchen. $(^ClickNext)"
+!insertmacro LanguageString TEXT_REINSTALL_ENABLE "$(^NameDA) Programmdateien erneut installieren"
+
+!insertmacro LanguageString TEXT_EXTERNAL_NOPRIVILEDGES "(Rechte als Administrator oder Hauptbenutzer erforderlich)"
+
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_TITLE "LaTeX Satzsystem"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_SUBTITLE "Es wird ein Satzsystem benötigt, um Dokumente zum Druck oder zur Publikation erzeugen zu können."
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_INFO_DOWNLOAD "Bitte geben Sie an, ob sie MiKTeX herunterladen wollen oder ob Sie eine bereits existierendes LaTeX-System nutzen wollen. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_INFO_INSTALL "Bitte geben Sie an, ob sie MiKTeX installieren wollen oder ob Sie eine bereits existierendes LaTeX -System nutzen wollen. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_DOWNLOAD "MiKTeX herunterladen"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_INSTALL "MiKTeX installieren"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_FOLDER "Ein bereits existierendes LaTeX-System im folgenden Verzeichnis nutzen:"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_FOLDER_INFO "Dieses Verzeichnis sollte ${BIN_LATEX} enthalten."
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_NONE "Installation ohne das LaTeX Satzsystem (nicht empfohlen)"
+!insertmacro LanguageString TEXT_EXTERNAL_LATEX_NOTFOUND "${BIN_LATEX} existiert nicht in dem von Ihnen angegebenen Verzeichnis."
+
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_TITLE "ImageMagick"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_SUBTITLE "ImageMagick wird benötigt, damit verschiedene Bildformate unterstützt werden können."
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_INFO_DOWNLOAD "Bitte geben Sie an, ob sie ImageMagick herunterladen wollen oder ob Sie es bereits installiert haben. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_INFO_INSTALL "Bitte geben Sie an, ob sie ImageMagick installieren wollen oder ob Sie es bereits installiert haben. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_DOWNLOAD "ImageMagick herunterladen"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_INSTALL "ImageMagick installieren"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_FOLDER "Eine bereits bestehende ImageMagick-Installation aus dem folgenden Verzeichnis nutzen:"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_FOLDER_INFO "Dieses Verzeichnis sollte ${BIN_IMAGEMAGICK} enthalten."
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_NONE "Installation ohne ImageMagick (nicht empfohlen)"
+!insertmacro LanguageString TEXT_EXTERNAL_IMAGEMAGICK_NOTFOUND "${BIN_IMAGEMAGICK} existiert nicht in dem von Ihnen angegebenen Verzeichnis."
+
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_TITLE "Ghostscript"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_SUBTITLE "Ghostscript wird für die Vorschauansicht von Bildern im PostScript-Format benötigt."
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_INFO_DOWNLOAD "Bitte geben Sie an, ob sie Ghostscript herunterladen wollen oder ob Sie es bereits installiert haben. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_INFO_INSTALL "Bitte geben Sie an, ob sie Ghostscript installieren wollen oder ob Sie es bereits installiert haben. $(^ClickNext)"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_DOWNLOAD "Ghostscript herunterladen"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_INSTALL "Ghostscript installieren"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_FOLDER "Eine bereits bestehende Ghostscript-Installation aus dem folgenden Verzeichnis nutzen:"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_FOLDER_INFO "Dieses Verzeichnis sollte ${BIN_GHOSTSCRIPT} enthalten."
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_NONE "Installation ohne Ghostscript (nicht empfohlen)"
+!insertmacro LanguageString TEXT_EXTERNAL_GHOSTSCRIPT_NOTFOUND "${BIN_GHOSTSCRIPT} existiert nicht in dem von Ihnen angegebenen Verzeichnis."
+
+!insertmacro LanguageString TEXT_VIEWER_TITLE "Dokumentenbetrachter"
+!insertmacro LanguageString TEXT_VIEWER_SUBTITLE "Um von Ihnen verfasste Dokumente auf Ihrem Bildschirm anzuzeigen, wird ein Anzeigeprogramm benötigt."
+!insertmacro LanguageString TEXT_VIEWER_INFO_DOWNLOAD "Auf Ihrem System ist kein Anzeigeprogramm für die Vorschauansicht von sowohl PDF- als auch Postscript-Dateien installiert, beides sind gebräuchliche Formate beim Dokumentensatz. Falls Sie das untenstehende Kästchen markieren, wird GSView heruntergeladen, ein Anzeigeprogramm für PDF- und Postscript-Dateien. $_CLICK"
+!insertmacro LanguageString TEXT_VIEWER_INFO_INSTALL "Auf Ihrem System ist kein Anzeigeprogramm für die Vorschauansicht von sowohl PDF- als auch Postscript-Dateien installiert, beides sind gebräuchliche Formate beim Dokumentensatz. Falls Sie das untenstehende Kästchen markieren, wird GSView installiert, ein Anzeigeprogramm für PDF- und Postscript-Dateien. $_CLICK"
+!insertmacro LanguageString TEXT_VIEWER_DOWNLOAD "GSView herunterladen"
+!insertmacro LanguageString TEXT_VIEWER_INSTALL "GSView installieren"
+
+!insertmacro LanguageString TEXT_DICT_TITLE "Wörterbücher zur Rechtschreibprüfung"
+!insertmacro LanguageString TEXT_DICT_SUBTITLE "Wählen Sie die Sprachen aus, für die eine Rechtschreibprüfung möglich sein soll."
+!insertmacro LanguageString TEXT_DICT_TOP "Um für Dokumente in einer bestimmten Sprache die Rechtschreibprüfung durchführen zu können, muss ein jeweils ein Wörterbuch mit dem nötigen Wortschatz heruntergeladen werden. Wählen Sie die Wörterbucher aus, die Sie herunterladen möchten. $_CLICK"
+!insertmacro LanguageString TEXT_DICT_LIST "Wählen Sie die Wörterbucher aus, die Sie herunterladen möchten:"
+
+!insertmacro LanguageString TEXT_LANGUAGE_TITLE "Wählen Sie die Sprache aus"
+!insertmacro LanguageString TEXT_LANGUAGE_SUBTITLE "Wählen Sie die Sprache aus, in der Sie $(^NameDA) nutzen wollen."
+!insertmacro LanguageString TEXT_LANGUAGE_INFO "Wählen Sie die Sprache aus, die Sie für die ${APP_NAME} Benutzeroberfläche nutzen wollen. $(^ClickNext)"
+
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_LATEX "Das Herunterladen von MiKTeX ist fehlgeschlagen. Möchten Sie es erneut versuchen?"
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_IMAGEMAGICK "Das Herunterladen von ImageMagick ist fehlgeschlagen. Möchten Sie es erneut versuchen?"
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_GHOSTSCRIPT "Das Herunterladen von Ghostscript ist fehlgeschlagen. Möchten Sie es erneut versuchen?"
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_VIEWER "Das Herunterladen von GSView ist fehlgeschlagen. Möchten Sie es erneut versuchen?"
+!insertmacro LanguageString TEXT_DOWNLOAD_FAILED_DICT "Das Herunterladen von Wöterbüchern für die ${DICT_NAME} Rechtschreibprüfung ist fehlgeschlagen. Möchten Sie es erneut versuchen?"
+
+!insertmacro LanguageString TEXT_NOTINSTALLED_LATEX "Die Installation von MiKTeX konnte nicht erfolgreich abgeschlossen werden. Möchten Sie MiKTeX erneut installieren?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_IMAGEMAGICK "Die Installation von ImageMagick konnte nicht erfolgreich abgeschlossen werden. Möchten Sie ImageMagick erneut installieren?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_GHOSTSCRIPT "Die Installation von Ghostscript konnte nicht erfolgreich abgeschlossen werden. Möchten Sie Ghostscript erneut installieren?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_VIEWER "GSView ist nicht für die Anzeige von PDF- oder Postscript-Dateien konfiguriert. Möchten Sie GSView erneut installieren?"
+!insertmacro LanguageString TEXT_NOTINSTALLED_DICT "Die Installation der Wörterbucher für die ${DICT_NAME} Rechtschreibprüfung konnte nicht erfolgreich abgeschlossen werden. Möchten Sie die Installation erneut versuchen?"
+
+!insertmacro LanguageString TEXT_FINISH_DESKTOP "Ein Symbol auf der Arbeitsoberfläche erzeugen"
+!insertmacro LanguageString TEXT_FINISH_WEBSITE "Besuchen Sie lyx.org für aktuelle Neuigkeiten, für Tips und Tricks sowie für sonstige Hinweise zur Unterstützung bei der Nutzung des Programms"
+
+!insertmacro LanguageString UNTEXT_WELCOME "Dieses Installationsprogramm wird Sie durch die Deinstallation von $(^NameDA) leiten. Bitte schließen Sie $(^NameDA) bevor Sie fortfahren.\r\n\r\nBeachten Sie bitte, dass im folgenden nur LyX selbst deinstalliert wird. Falls Sie andere Anwendungen aus ihrem System entfernen möchten, die zur Nutzung von Lyx installiert wurden, benutzen Sie hierzu bitte den Eintrag Software im Menü Systemsteuerung und wählen Sie dort dann den entsprechenden Eintrag für das Programm aus.\r\n\r\n$_CLICK"

development/Win32/packaging/installer/lyx.nsi

@@ -17,9 +17,17 @@ OutFile "${SETUP_EXE}"
 ;Functions
 
 Function .onInit
-  !insertmacro MUI_LANGDLL_DISPLAY
+  ${unless} ${silent}
+    Banner::show /NOUNLOAD "Checking system"
+  ${endif}
+  
   Call CheckWindows
   Call SearchAll
+
+  ${unless} ${silent}
+    Banner::destroy
+    !insertmacro MUI_LANGDLL_DISPLAY
+  ${endif}
 FunctionEnd
 
 Function un.onInit

development/Win32/packaging/installer/settings.nsh

@@ -9,56 +9,65 @@ Settings for LyX installer
 
 !define FILES_LICENSE "license.rtf"
 
-!define FILES_LYX "..\..\..\..\build\installprefix"
 !define FILES_ICONS "..\icons"
-!define FILES_QT "..\..\..\..\..\..\local\qt-3"
-!define FILES_DEPS "..\..\..\..\..\..\local"
-!define FILES_MSYS "..\..\..\..\..\.."
-!define FILES_MINGW "..\..\..\..\..\..\mingw"
-!define FILES_ASPELL "C:\Aspell\bin"
-!define FILES_ASPELLDATA "..\..\..\..\..\..\local\aspell"
-!define FILES_DVIPOST "..\..\..\..\..\..\local\dvipost"
-!define FILES_PYTHON "C:\Python24"
-!define FILES_WINDOWS "C:\Windows\System32" ;For Python DLL
 !define FILES_FONTS "..\bakoma"
 
+!ifdef BUILD_MSVC
+  !define FILES_MSVC "${FILES_WINDOWS}\WinSxS\x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.42_x-ww_0de06acd"
+  !define FILES_NETPBM "${FILES_DEPS}\netpbm"
+  !define FILES_DTL "${FILES_DEPS}\dtl"
+  !define FILES_AIKSAURUS "${FILES_DEPS}\aiksaurus\"
+  !define FILES_DVIPOST "${FILES_DEPS}\dvipost"
+  !define FILES_DVIPOST_PKG "${FILES_DVIPOST}"
+!else
+  !define FILES_NETPBM "${FILES_DEPS}\bin"
+  !define FILES_DTL "${FILES_DEPS}\bin"
+  !define FILES_AIKSAURUS "${FILES_DEPS}\share\Aiksaurus\"
+  !define FILES_DVIPOST "${FILES_DEPS}\bin"
+  !define FILES_DVIPOST_PKG "${FILES_DEPS}\dvipost"
+!endif
+
+!define FILES_QT "${FILES_DEPS}\qt-3"
+!define FILES_DVIPOSTDATA "${FILES_DEPS}\dvipost"
+!define FILES_ASPELLDATA "${FILES_DEPS}\aspell"
+
 ;--------------------------------
 ;Locations of components to download
 
-!define DOWNLOAD_LATEX "http://superb-west.dl.sourceforge.net/sourceforge/miktex/basic-miktex-2.4.2207.exe"
+!define DOWNLOAD_LATEX "http://superb-west.dl.sourceforge.net/sourceforge/miktex/basic-miktex-2.5.2449.exe"
-!define DOWNLOAD_IMAGEMAGICK "http://superb-west.dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-6.2.8-0-Q16-windows-dll.exe"
+!define DOWNLOAD_IMAGEMAGICK "http://superb-west.dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-6.2.9-6-Q16-windows-dll.exe"
-!define DOWNLOAD_GHOSTSCRIPT "http://tug.ctan.org/tex-archive/nonfree/support/ghostscript/AFPL/gs853/gs853w32.exe"
+!define DOWNLOAD_GHOSTSCRIPT "http://superb-west.dl.sourceforge.net/sourceforge/ghostscript/gs854w32.exe"
 !define DOWNLOAD_VIEWER "http://tug.ctan.org/tex-archive/nonfree/support/ghostscript/ghostgum/gsv48w32.exe"
 
 ;--------------------------------
 ;Download size (in KB)
 
-!define SIZE_DOWNLOAD_LATEX 32470
+!define SIZE_DOWNLOAD_LATEX 43127
-!define SIZE_DOWNLOAD_IMAGEMAGICK 6582
+!define SIZE_DOWNLOAD_IMAGEMAGICK 6790
-!define SIZE_DOWNLOAD_GHOSTSCRIPT 9325
+!define SIZE_DOWNLOAD_GHOSTSCRIPT 12669
 !define SIZE_DOWNLOAD_VIEWER 1459
 
 ;--------------------------------
 ;Approximations of space required for components (in KB)
 
-!define SIZE_LATEX 133120
+!define SIZE_LATEX 120000
-!define SIZE_IMAGEMAGICK 20480
+!define SIZE_IMAGEMAGICK 17000
-!define SIZE_GHOSTSCRIPT 25600 
+!define SIZE_GHOSTSCRIPT 26000
-!define SIZE_VIEWER 4096
+!define SIZE_VIEWER 4000
 
 ;--------------------------------
 ;Locations of setup files for components (for bundled setup)
 
-!define INSTALL_LATEX "basic-miktex-2.4.2207.exe"
+!define INSTALL_LATEX "basic-miktex-2.5.2449.exe"
-!define INSTALL_IMAGEMAGICK "ImageMagick-6.2.8-0-Q16-windows-dll.exe"
+!define INSTALL_IMAGEMAGICK "ImageMagick-6.2.9-6-Q16-windows-dll.exe"
-!define INSTALL_GHOSTSCRIPT "gs853w32.exe"
+!define INSTALL_GHOSTSCRIPT "gs854w32.exe"
 !define INSTALL_VIEWER "gsv48w32.exe"
 
 ;--------------------------------
 ;Names and version
 
 !define APP_NAME "LyX"
-!define /date APP_VERSION "1.4.2svn %Y%m%d"
+!define /date APP_VERSION "1.4svn %Y%m%d"
 !define APP_SERIES_NAME "1.4"
 !define APP_SERIES_KEY "14"
 !define APP_DIR_USERDATA "LyX1.4.x"
@@ -78,9 +87,9 @@ Settings for LyX installer
 ;Setup settings
 
 !ifndef SETUPTYPE_BUNDLE
-  !define /date SETUP_EXE "lyx-142svn-%Y%m%d.exe"
+  !define /date SETUP_EXE "lyx-14svn-%Y%m%d.exe"
 !else
-  !define /date SETUP_EXE "lyx-142svn-%Y%m%d.exe-bundle.exe"
+  !define /date SETUP_EXE "lyx-14svn-%Y%m%d.exe-bundle.exe"
 !endif
 
 !define SETUP_DEFAULT_DIRECTORY "$PROGRAMFILES\${APP_NAME}${APP_SERIES_KEY}"
@@ -93,7 +102,7 @@ Settings for LyX installer
 ;--------------------------------
 ;Names of binaries to identify compontents
 
-!define BIN_LATEX "latex.exe"
+!define BIN_LATEX "tex.exe"
 !define BIN_IMAGEMAGICK "convert.exe"
 !define BIN_GHOSTSCRIPT "gswin32c.exe"
 

development/Win32/packaging/installer/settings.user.nsh

@@ -0,0 +1,36 @@
+;LyX Windows Installer
+;User Settings
+
+;Uncomment the right settting for your build environment
+;BUILD_MSVC = Microsoft Visual C++ 2005
+;BUILD_MINGW = MinGW/MSYS
+
+!define BUILD_MSVC
+;!define BUILD_MINGW 
+
+;Location of LyX files and dependencies
+
+!ifdef BUILD_MSVC
+
+  ;Settings for MSVC build
+
+  !define FILES_LYX "..\..\..\..\build-msvc"
+  !define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc"
+  
+!else
+
+  ;Settings for MinGW build
+
+  !define FILES_LYX "..\..\..\..\build\installprefix"
+  !define FILES_DEPS "..\..\..\..\..\..\local"  
+  !define FILES_MINGW "..\..\..\..\..\..\mingw"
+
+!endif
+
+;Location of Windows installation
+
+!define FILES_WINDOWS "C:\WINDOWS"
+
+;Location of Python 2.5
+
+!define FILES_PYTHON "C:\Python25"