* Manifest for private CRT assembly included

* Enabled French and German translations
* No manual language selection required anymore

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

development/Win32/packaging/Microsoft.VC80.CRT.manifest

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright © 1981-2001 Microsoft Corporation -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity 
+        type="win32" 
+        name="Microsoft.VC80.CRT" 
+        version="8.0.50608.0" 
+        processorArchitecture="x86" 
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr80.dll"/>
+    <file name="msvcp80.dll"/>
+    <file name="msvcm80.dll"/>
+</assembly>

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

@@ -22,7 +22,11 @@ Section -Core SecCore
   
   RMDir /r "$INSTDIR\python\DLLs"
   RMDir /r "$INSTDIR\python\libs"
-  RMDir /r "$INSTDIR\python\python25.dll"  
+  RMDir /r "$INSTDIR\python\python25.dll"
+  
+  ;Remove previous latextools folder (moved to bin)
+  
+  RMDir /r "$INSTDIR\latextools"
   
   ;Binaries
   
@@ -36,6 +40,7 @@ Section -Core SecCore
     
     !insertmacro FileListDllMSVCBin File "${FILES_DEPS}\bin\"
     !insertmacro FileListMSVCBin File "${FILES_MSVC}\"
+    !insertmacro FileListMSVCManifest File "..\"    
   !else
     !insertmacro FileListDllMSVCBin Delete "$INSTDIR\bin\"
     !insertmacro FileListMSVCBin Delete "$INSTDIR\bin\"  
@@ -44,9 +49,6 @@ Section -Core SecCore
     !insertmacro FileListMinGWBin File "${FILES_MINGW}\bin\" 
   !endif
 
-  ;LaTeX tools
-  
-  SetOutPath "$INSTDIR\latextools"
   !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
   !insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
   !insertmacro FileListDTLBin File "${FILES_DTL}\"

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

@@ -18,17 +18,15 @@ Section "un.Program Files" un.SecProgramFiles
   !ifdef BUILD_MSVC
     !insertmacro FileListDllMSVCBin Delete "$INSTDIR\bin\"
     !insertmacro FileListMSVCBin Delete "$INSTDIR\bin\"
+    !insertmacro FileListMSVCManifest 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"
+  !insertmacro FileListNetpbmBin Delete "$INSTDIR\bin\"
+  !insertmacro FileListDvipostBin Delete "$INSTDIR\bin\"
+  !insertmacro FileListDTLBin Delete "$INSTDIR\bin\"
   
   ;Icons
   

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

@@ -107,7 +107,7 @@ Function GetPathPrefix
 
   Push $R0
 
-  StrCpy $R0 "$INSTDIR\bin;$INSTDIR\latextools;$INSTDIR\python"
+  StrCpy $R0 "$INSTDIR\python"
   
   ${if} $PathLaTeX != ""
     StrCpy $R0 "$R0;$PathLaTeX"

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

@@ -37,6 +37,12 @@ Lists of files to include in the installer
   
 !macroend
 
+!macro FileListMSVCManifest COMMAND DIRECTORY
+
+  ${COMMAND} "${DIRECTORY}\Microsoft.VC80.CRT.manifest"
+  
+!macroend
+
 !macro FileListMinGWBin COMMAND DIRECTORY
 
   ${COMMAND} "${DIRECTORY}mingwm10.dll"

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

@@ -85,6 +85,8 @@ Page custom PageLanguage PageLanguageValidate
 ;Languages
 
 !insertmacro IncludeLang "english"
+!insertmacro IncludeLang "french"
+!insertmacro IncludeLang "german"
 !insertmacro IncludeLang "italian"
 
 ;--------------------------------

development/Win32/packaging/installer/lyx.nsi

@@ -26,7 +26,6 @@ Function .onInit
 
   ${unless} ${silent}
     Banner::destroy
-    !insertmacro MUI_LANGDLL_DISPLAY
   ${endif}
 FunctionEnd