X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FWin32%2Fpackaging%2FAltInstaller%2FLyXInstaller-small.nsi;h=ebc8058598376b8511711f444b0c1bb44764c724;hb=c8218c119a1017bee657e494bee8428f283e0598;hp=ed5f3cb3afe8dfd6b34a606b01ba446194104c16;hpb=07919fb0b06ad85c7c5c51107dfb7d38dd01ae62;p=lyx.git

diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
index ed5f3cb3af..ebc8058598 100644
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
@@ -6,11 +6,11 @@
 # Licence details can be found in the file COPYING or copy at
 # http://www.lyx.org/about/license.php3
 
-# Author Uwe Stöhr based on the work of Angus Leeming and ideas of Joost Verburg
+# Author: Uwe Stöhr based on the work of Angus Leeming and ideas of Joost Verburg
 # Full author contact details are available in file CREDITS or copy at
 # http://www.lyx.org/about/credits.php
 
-# This script requires NSIS 2.30 or newer
+# This script requires NSIS 2.45 or newer
 # http://nsis.sourceforge.net/
 #--------------------------------
 
@@ -35,25 +35,29 @@ CRCCheck force
 #--------------------------------
 # variables only used in this installer version
 
-Var DelPythonFiles
-Var GhostscriptPath
+Var AppFiles
 Var AiksaurusPath
 Var AspellPath
 Var Acrobat
-Var PSVPath
+Var BibTeXEditorPath
 Var DelGSDir
+Var DelPythonFiles
+Var DelWMFDir
 Var EditorPath
+Var GhostscriptPath
 Var ImageEditorPath
-Var BibTeXEditorPath
 Var LangEncoding
 Var LangSysEncoding
-Var MissedProg
 Var LaTeXName
 Var MiKTeXVersion
 Var MiKTeXUser
+Var MissedProg
+Var PathPrefix
+Var PSVPath
 Var State
 Var SVGPath
-Var AppFiles
+Var WMFPath
+
 # Variables used by all installer versions
 !include "Variables.nsh"
 
@@ -64,6 +68,7 @@ Var AppFiles
 !include "FileFunc.nsh"
 !include "StrFunc.nsh"
 !include "TextFunc.nsh"
+!include "WinVer.nsh"
 
 # Set of various macros and functions
 !include "LyXUtils.nsh"
@@ -147,45 +152,9 @@ Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction
 !insertmacro MUI_UNPAGE_INSTFILES
 
 #--------------------------------
-# Languages
-
-!insertmacro MUI_LANGUAGE "English" # first language is the default language
-!insertmacro MUI_LANGUAGE "Czech"
-!insertmacro MUI_LANGUAGE "Danish"
-!insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Galician"
-!insertmacro MUI_LANGUAGE "Hungarian"
-!insertmacro MUI_LANGUAGE "Italian"
-!insertmacro MUI_LANGUAGE "Japanese"
-!insertmacro MUI_LANGUAGE "Norwegian"
-!insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "Romanian"
-!insertmacro MUI_LANGUAGE "Slovak"
-!insertmacro MUI_LANGUAGE "Spanish"
-!insertmacro MUI_LANGUAGE "Swedish"
-!insertmacro MUI_LANGUAGE "Turkish"
-
-!include "lyx_languages\english.nsh"
-!include "lyx_languages\czech.nsh"
-!include "lyx_languages\danish.nsh"
-!include "lyx_languages\dutch.nsh"
-!include "lyx_languages\french.nsh"
-!include "lyx_languages\german.nsh"
-!include "lyx_languages\galician.nsh"
-!include "lyx_languages\hungarian.nsh"
-!include "lyx_languages\italian.nsh"
-!include "lyx_languages\japanese.nsh"
-!include "lyx_languages\norwegian.nsh"
-!include "lyx_languages\polish.nsh"
-!include "lyx_languages\portuguese.nsh"
-!include "lyx_languages\romanian.nsh"
-!include "lyx_languages\slovak.nsh"
-!include "lyx_languages\spanish.nsh"
-!include "lyx_languages\swedish.nsh"
-!include "lyx_languages\turkish.nsh"
+# List of languages the installers are translated to
+
+!include "TranslatedLanguages.nsh"
 
 LicenseData "$(LyXLicenseData)"
 
@@ -251,6 +220,9 @@ Function .onInit
    MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)"
    Abort
   ${endif}
+  
+  # printer settings, needed to install the Metafile2eps printer
+  !insertmacro PrinterInit # macro from InstallThirdPartyProgs.nsh
 
   # default settings
   # these can be reset to "all" in section SecAllUsers