* remove old installer code for external ImageMagick and Ghostscript

* remove old text in uninstaller
* remove language selection in installer (now integrated in LyX prefs)
* updates for MSVC 2010

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

development/Makefile.am

@@ -33,15 +33,12 @@ Win32/packaging/icons/lyx_doc_32x32_16colors.png \
 Win32/packaging/installer/graphics/header.bmp \
 Win32/packaging/installer/graphics/wizard.bmp \
 Win32/packaging/installer/gui/external.nsh \
-Win32/packaging/installer/gui/langselect.nsh \
 Win32/packaging/installer/gui/reinstall.nsh \
 Win32/packaging/installer/include/declarations.nsh \
 Win32/packaging/installer/include/detection.nsh \
-Win32/packaging/installer/include/dictlist.nsh \
 Win32/packaging/installer/include/filelist.nsh \
 Win32/packaging/installer/include/gui.nsh \
 Win32/packaging/installer/include/init.nsh \
-Win32/packaging/installer/include/langlist.nsh \
 Win32/packaging/installer/include/nsis.nsh \
 Win32/packaging/installer/include/variables.nsh \
 Win32/packaging/installer/lang/english.nsh \

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

@@ -27,24 +27,6 @@ Var LaTeXSetup.State
 Var LaTeXExisting.State
 Var LaTeXNoInstall.State
 
-!ifndef BUNDLE_IMAGEMAGICK
-
-Var ImageMagickState
-Var ImageMagickSetup.State
-Var ImageMagickExisting.State
-Var ImageMagickNoInstall.State
-
-!endif
-
-!ifndef BUNDLE_GHOSTSCRIPT
-
-Var GhostscriptState
-Var GhostscriptSetup.State
-Var GhostscriptExisting.State
-Var GhostscriptNoInstall.State
-
-!endif
-
 Var ControlState
 Var ComponentSize
 
@@ -93,15 +75,6 @@ Var ComponentSize
   Pop $ExternalPage.NoInstall
   nsDialogs::OnClick /NOUNLOAD $ExternalPage.NoInstall $ExternalPage.RadioButton.Click
    
-  !if ${COMPONENT} != LaTeX
-  # ImageMagick and Ghostscript require Administrator or
-  # power user privileges for installation
-  ${If} $MultiUser.Privileges != "Admin"
-  ${AndIf} $MultiUser.Privileges != "Power"
-    EnableWindow $ExternalPage.Setup 0
-  ${EndIf}
-  !endif
-  
   # Set the state of the controls to the previous user selection (or the default)
 
   ${If} $${COMPONENT}State == ""
@@ -237,27 +210,3 @@ FunctionEnd
 Function PageExternalLaTeXValidate
   !insertmacro EXTERNAL_VALIDATEDIALOG LaTeX
 FunctionEnd
-
-!ifndef BUNDLE_IMAGEMAGICK
-
-Function PageExternalImageMagick
-  !insertmacro EXTERNAL_SHOWDIALOG ImageMagick
-FunctionEnd
-
-Function PageExternalImageMagickValidate
-  !insertmacro EXTERNAL_VALIDATEDIALOG ImageMagick
-FunctionEnd
-
-!endif
-
-!ifndef BUNDLE_GHOSTSCRIPT
-
-Function PageExternalGhostscript
-  !insertmacro EXTERNAL_SHOWDIALOG Ghostscript
-FunctionEnd
-
-Function PageExternalGhostscriptValidate
-  !insertmacro EXTERNAL_VALIDATEDIALOG Ghostscript
-FunctionEnd
-
-!endif

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

@@ -1,77 +0,0 @@
-/*
-
-langselect.nsh
-
-Selection of language for LyX interface
-
-*/
-
-Var LangSelectPage
-Var LangSelectPage.Info
-Var LangSelectPage.DropList
-
-Var LangSystem
-
-!macro LoadLang VAR LANGNAME LANGISOCODE LANGID
-
-  ${NSD_CB_AddString} $LangSelectPage.DropList "${LANGNAME}" 
-
-!macroend
-
-!macro SetSystemLang VAR LANGNAME LANGISOCODE LANGID
-
-  ${If} ${VAR} == ${LANGID}
-    ${NSD_CB_SelectString} $LangSelectPage.DropList "${LANGNAME}" 
-  ${EndIf}
-
-!macroend
-
-!macro GetISOLangCode VAR_LANGNAME VAR_LANGISOCODE LANGNAME LANGISOCODE LANGID
-
-  ${If} ${VAR_LANGNAME} == "${LANGNAME}"
-    StrCpy ${VAR_LANGISOCODE} "${LANGISOCODE}"
-  ${EndIf}
-  
-!macroend
-
-# Page functions
-
-Function PageLanguage
-
-  # Build the dialog
-
-  !insertmacro MUI_HEADER_TEXT "$(TEXT_LANGUAGE_TITLE)" "$(TEXT_LANGUAGE_SUBTITLE)"
-  
-  nsDialogs::Create /NOUNLOAD 1018
-  Pop $LangSelectPage
-  
-  ${NSD_CreateLabel} 0u 0u 300u 20u $(TEXT_LANGUAGE_INFO)
-  Pop $LangSelectPage.Info
-  
-  ${NSD_CreateDropList} 0u 40u 110u 100u ""
-  Pop $LangSelectPage.DropList
-  
-  # Load list of languages
-  !insertmacro Languages '!insertmacro LoadLang $LangSystem'
-  
-  ${If} $LangName == ""
-    # Set the default for the language selection dialog to the Windows language
-    System::Call "kernel32::GetUserDefaultUILanguage()i.s"
-    Pop $LangSystem
-    !insertmacro Languages '!insertmacro SetSystemLang $LangSystem'
-  ${Else}
-    # Restore previous user selection
-    ${NSD_CB_SelectString} $LangSelectPage.DropList $LangName    
-  ${EndIf}
-  
-  nsDialogs::Show
- 
-FunctionEnd
-
-Function PageLanguageValidate
-
-  ${NSD_GetText} $LangSelectPage.DropList $LangName
-  # Convert to ISO code
-  !insertmacro Languages '!insertmacro GetISOLangCode $LangName $LangISOCode'
-
-FunctionEnd

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

@@ -14,21 +14,23 @@ SetCompressor /SOLID lzma
 !ifdef FilesLyX
   !define FILES_LYX "${FilesLyX}"
 !else
-  !define FILES_LYX "..\..\..\..\build-msvc"
+  !define FILES_LYX "..\..\..\..\..\lyx-20-install"
 !endif
 
 !ifdef FilesDeps
   !define FILES_DEPS "${FilesDeps}"
 !else
-  !define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc2008"
+  !define FILES_DEPS "..\..\..\..\..\deps20"
 !endif
 
 !ifdef FilesBundle
   !define FILES_BUNDLE "${FilesBundle}"
 !else
-  !define FILES_BUNDLE "..\..\..\..\lyx-windows-bundle-deps"
+  !define FILES_BUNDLE "..\..\..\..\..\depsbundle"
 !endif
 
+!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.7.1"
+
 #--------------------------------
 # File locations
 
@@ -38,11 +40,7 @@ SetCompressor /SOLID lzma
 !define FILES_LAUNCHER "..\..\launcher"
 !define FILES_PDFVIEW "..\..\pdfview"
 
-!if ${COMPILER_OS} == VISTA 
+!define FILES_MSVC "${FILES_DEPS}\bin"
-  !define FILES_MSVC "$%SystemRoot%\WinSxS\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.21022.8_none_bcb86ed6ac711f91"
-!else
-  !define FILES_MSVC "$%SystemRoot%\WinSxS\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375"
-!endif
 !define FILES_PYTHON "${FILES_DEPS}\python"
 !define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
 !define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
@@ -53,8 +51,6 @@ SetCompressor /SOLID lzma
 !define FILES_PDFTOOLS "${FILES_DEPS}\pdftools"
 !define FILES_METAFILE2EPS "${FILES_DEPS}\metafile2eps"
 
-!define FILES_QT "${FILES_DEPS}\qt-4"
-
 !define FILES_NSISPLUGINS "${FILES_DEPS}\nsis"
 
 #--------------------------------
@@ -63,15 +59,11 @@ SetCompressor /SOLID lzma
 # CTAN and SourceForge select a mirror automatically
 
 !define DOWNLOAD_LATEX "http://www.ctan.org/get/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
-!define DOWNLOAD_IMAGEMAGICK "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_IMAGEMAGICK}"
-!define DOWNLOAD_GHOSTSCRIPT "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_GHOSTSCRIPT}"
 
 #--------------------------------
 # Locations of setup files for components (for bundled setup)
 
 !define INSTALL_LATEX "${SETUPFILE_LATEX}"
-!define INSTALL_IMAGEMAGICK "${SETUPFILE_IMAGEMAGICK}"
-!define INSTALL_GHOSTSCRIPT "${SETUPFILE_GHOSTSCRIPT}"
 
 #--------------------------------
 # Names and version
@@ -83,7 +75,7 @@ SetCompressor /SOLID lzma
 !define APP_DIR "${APP_NAME}${APP_SERIES_KEY}"
 !define APP_DIR_USERDATA "${APP_NAME}${APP_SERIES_KEY}"
 !define APP_INFO "${APP_NAME} - The Document Processor"
-!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2008 LyX Team"
+!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2011 LyX Team"
 
 !define APP_RUN "bin\LyXLauncher.exe"
 
@@ -106,21 +98,13 @@ SetCompressor /SOLID lzma
   !define SETUPTYPE STANDARD
 !endif
  
-!if ${SETUPTYPE} == MINIMAL
+!if ${SETUPTYPE} == STANDARD
-
-  !define SETUP_EXE ${MinimalExeFile}
- 
-!else if ${SETUPTYPE} == STANDARD
 
   !define SETUP_EXE ${ExeFile}
-  !define BUNDLE_IMAGEMAGICK
-  !define BUNDLE_GHOSTSCRIPT
 
 !else if ${SETUPTYPE} == BUNDLE
 
   !define SETUP_EXE ${BundleExeFile}
-  !define BUNDLE_IMAGEMAGICK
-  !define BUNDLE_GHOSTSCRIPT
   !define BUNDLESETUP_LATEX
 
 !endif
@@ -135,8 +119,6 @@ SetCompressor /SOLID lzma
 # Names of binaries to identify compontents
 
 !define BIN_LATEX "tex.exe"
-!define BIN_IMAGEMAGICK "convert.exe"
-!define BIN_GHOSTSCRIPT "gswin32c.exe"
 !define BIN_BIBTEXEDITOR "JabRef.exe"
 
 #--------------------------------

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

@@ -28,16 +28,11 @@ Lists of files to include in the installer
 
 !macroend
 
-!macro FileListMSVCBin COMMAND DIRECTORY
+!macro FileListMSVC COMMAND DIRECTORY
 
-  ${FILE}msvcr90.dll"
+  # Manifest not needed for 2010
-  ${FILE}msvcp90.dll"
+  ${FILE}msvcr100.dll"
-  
+  ${FILE}msvcp100.dll"
-!macroend
-
-!macro FileListMSVCManifest COMMAND DIRECTORY
-
-  ${FILE}\Microsoft.VC90.CRT.manifest"
   
 !macroend
 
@@ -46,7 +41,7 @@ Lists of files to include in the installer
   ${FILE}iconv.dll"
   ${FILE}intl.dll"
   ${FILE}libhunspell.dll"
-  ${FILE}zlib1.dll"
+  ${FILE}zlibwapi.dll"
 
 !macroend
 

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

@@ -30,7 +30,6 @@ BrandingText " "
 
 # Installer
 
-!define MUI_WELCOMEPAGE_TITLE_3LINES
 !define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME)
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"
@@ -38,13 +37,6 @@ BrandingText " "
 
 Page custom PageReinstall PageReinstallValidate
 Page custom PageExternalLaTeX PageExternalLaTeXValidate
-!ifndef BUNDLE_IMAGEMAGICK
-Page custom PageExternalImageMagick PageExternalImageMagickValidate
-!endif
-!ifndef BUNDLE_GHOSTSCRIPT
-Page custom PageExternalGhostscript PageExternalGhostscriptValidate
-!endif
-Page custom PageLanguage PageLanguageValidate
 
 !define MUI_PAGE_HEADER_TEXT $(TEXT_DICT_TITLE)
 !define MUI_PAGE_HEADER_SUBTEXT $(TEXT_DICT_SUBTITLE)
@@ -67,8 +59,6 @@ Page custom PageLanguage PageLanguageValidate
 
 # Uninstaller
 
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-!define MUI_WELCOMEPAGE_TEXT $(UNTEXT_WELCOME)
 !insertmacro MUI_UNPAGE_WELCOME
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_COMPONENTS

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

@@ -87,8 +87,6 @@ Function InitUser
   # Get directories of components from registry
   
   !insertmacro EXTERNAL_INIT LaTeX
-  !insertmacro EXTERNAL_INIT ImageMagick
-  !insertmacro EXTERNAL_INIT Ghostscript
   
   # Get LyX language
   

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

@@ -1,44 +0,0 @@
-/*
-
-langlist.nsh
-
-List of langauges supported by the LyX
-
-*/
-
-!macro Languages COMMAND
-
-  # List of LyX translations with ISO code and language identifier
-
-  ${COMMAND} "Català" ca_ES 1027
-  ${COMMAND} "Ceština" cs_CZ 1029
-  ${COMMAND} "Chinese (Simplified)" zh_CN 2052
-  ${COMMAND} "Chinese (Traditional)" zh_TW 1028
-  # ${COMMAND} "Dansk" da_DK 1030
-  ${COMMAND} "Deutsch" de_DE 1031
-  ${COMMAND} "English" en_EN 1033
-  ${COMMAND} "Español" es_ES 1034
-  ${COMMAND} "Euskara" eu_EU 1069
-  ${COMMAND} "Français" fr_FR 1036
-  ${COMMAND} "Galego" gl_ES 1036
-  ${COMMAND} "Hebrew" he_IL 1037
-  ${COMMAND} "Italiano" it_IT 1057
-  ${COMMAND} "Japanese" ja_JP 1041
-  # ${COMMAND} "Korean" ko 1042
-  ${COMMAND} "Magyar" hu_HU 1038
-  # ${COMMAND} "Nederlands" nl_NL 1043
-  ${COMMAND} "Norsk (Bokmål)" nb_NO 1044
-  ${COMMAND} "Norsk (Nynorsk)" nn_NO 2068
-  ${COMMAND} "Português" pt_PT 1046
-  ${COMMAND} "Polski"  pl_PL 1045
-  ${COMMAND} "Româna" ro_RO 1048
-  # ${COMMAND} "Russian" ru_RU 1049
-  # ${COMMAND} "Slovencina" sk_SK 1060
-  # ${COMMAND} "Slovenšcina" sl_SI 1051
-  ${COMMAND} "Suomi" fi_FI 1035
-  # ${COMMAND} "Svenska" sv_SE 1053
-  # ${COMMAND} "Türkçe" tr_TR 1055
-  ${COMMAND} "Ukrainian" uk_UK 1058
-  # ${COMMAND} "Walon" wa_BE 1055
-
-!macroend

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

@@ -8,24 +8,11 @@ Variables that are shared between multiple files
 
 Var PathLaTeX
 Var PathLaTeXLocal
-Var PathImageMagick
-Var PathGhostscript
 Var PathBibTeXEditor
 
 Var SetupLaTeX
 Var SizeLaTeX
 
-!ifndef BUNDLE_IMAGEMAGICK
-  Var SetupImageMagick
-  Var SizeImageMagick
-!endif
-
-!ifndef BUNDLE_GHOSTSCRIPT
-  Var SetupGhostscript
-  Var SizeGhostscript
-!endif
-
 Var LangName
-Var LangISOCode
 
 Var PrinterConf

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

@@ -12,11 +12,11 @@ ${LangFileString} TEXT_NO_PRIVILEDGES "You don't have Administrator or Power Use
 
 ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)"
 
-${LangFileString} TEXT_WELCOME "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}.$\r$\n$\r$\n$(^ClickNext)"
+${LangFileString} TEXT_WELCOME "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$\n$(^ClickNext)"
 
 ${LangFileString} TEXT_REINSTALL_TITLE "Reinstall"
 ${LangFileString} TEXT_REINSTALL_SUBTITLE "Choose whether you want to reinstall the $(^NameDA) program files."
-${LangFileString} TEXT_REINSTALL_INFO "$(^NameDA) is already installed. This installer will allow you to change the interface language and locations of external applications or download additional dictionaries. If you also want to reinstall the program files, check the box below. $(^ClickNext)"
+${LangFileString} TEXT_REINSTALL_INFO "$(^NameDA) is already installed. This installer will allow you to change the location of your LaTeX system or download additional dictionaries. If you also want to reinstall the program files, check the box below. $(^ClickNext)"
 ${LangFileString} TEXT_REINSTALL_ENABLE "Reinstall $(^NameDA) program files"
 
 ${LangFileString} TEXT_EXTERNAL_NOPRIVILEDGES "(Administrator or Power User privileges required)"
@@ -88,5 +88,3 @@ ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
 ${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips"
-
-${LangFileString} UNTEXT_WELCOME "This wizard will guide you through the uninstallation of $(^NameDA). Please close $(^NameDA) before you continue.$\r$\n$\r$\nNote that this wizard will only uninstall LyX itself. If you want to uninstall other applications you installed for use with LyX, uninstall them using their entry in Add/Remove Programs.$\r$\n$\r$\n$_CLICK"

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

@@ -12,11 +12,11 @@ ${LangFileString} TEXT_NO_PRIVILEDGES "Vous n'avez pas les privil
 
 ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installation pour l'utilisateur courant)"
 
-${LangFileString} TEXT_WELCOME "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}.$\r$\n$\r$\n$(^ClickNext)"
+${LangFileString} TEXT_WELCOME "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$\n$(^ClickNext)"
 
 ${LangFileString} TEXT_REINSTALL_TITLE "Réinstallation"
 ${LangFileString} TEXT_REINSTALL_SUBTITLE "Réinstallation éventuelle des fichiers programmes de $(^NameDA) ?"
-${LangFileString} 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)"
+${LangFileString} TEXT_REINSTALL_INFO "$(^NameDA) est déjà installé. Cet assistant vous permettra de modifier 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)"
 ${LangFileString} TEXT_REINSTALL_ENABLE "Réinstaller les fichiers programmes $(^NameDA)"
 
 ${LangFileString} TEXT_EXTERNAL_NOPRIVILEDGES "(Privilèges d'administration requis)"
@@ -88,5 +88,3 @@ ${LangFileString} TEXT_CONFIGURE_LYX "Configuration de LyX (MiKTeX peut t
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Créer un raccourci sur le bureau"
 ${LangFileString} TEXT_FINISH_WEBSITE "Consulter les dernières nouvelles, trucs et astuces sur le site lyx.org"
-
-${LangFileString} 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

@@ -10,11 +10,11 @@ Author: Andreas Deininger
 
 ${LangFileString} TEXT_NO_PRIVILEDGES "Sie gehören weder der Gruppe der Administratoren noch der Gruppe der Hauptbenutzer an.$\r$\nDie Werkzeuge zur Grafikkonvertierung können ohne diese Rechte nicht installiert werden."
 
-${LangFileString} TEXT_WELCOME "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.$\r$\n$\r$\n$(^ClickNext)"
+${LangFileString} TEXT_WELCOME "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$\n(^ClickNext)"
 
 ${LangFileString} TEXT_REINSTALL_TITLE "Erneute Installation"
 ${LangFileString} TEXT_REINSTALL_SUBTITLE "Wählen Sie aus, ob Sie die $(^NameDA) Programmdateien erneut installieren möchten."
-${LangFileString} 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)"
+${LangFileString} TEXT_REINSTALL_INFO "$(^NameDA) ist bereits installiert. Das Installationsprogramm gestattet Ihnen 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)"
 ${LangFileString} TEXT_REINSTALL_ENABLE "$(^NameDA) Programmdateien erneut installieren"
 
 ${LangFileString} TEXT_EXTERNAL_NOPRIVILEDGES "(Rechte als Administrator oder Hauptbenutzer erforderlich)"
@@ -82,5 +82,3 @@ ${LangFileString} TEXT_NOTINSTALLED_DICT "Die Installation der W
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Ein Symbol auf der Arbeitsoberfläche erzeugen"
 ${LangFileString} TEXT_FINISH_WEBSITE "Besuchen Sie lyx.org für aktuelle Neuigkeiten"
-
-${LangFileString} 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/lang/italian.nsh

@@ -10,11 +10,11 @@ Author: Enrico Forestieri
 
 ${LangFileString} TEXT_NO_PRIVILEDGES "Non si hanno privilegi da amministratore o utente avanzato.$\r$\nLe utilità per la conversione delle immagini non possono essere installate senza tali privilegi."
 
-${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA), il compilatore di documenti che incoraggia un approccio alla scrittura basato sulla struttura dei vostri testi, non sulla loro apparenza.$\r$\n$\r$\nQuesto installer preparerà un ambiente completo per usare ${APP_NAME}.$\r$\n$\r$\n$(^ClickNext)"
+${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA), il compilatore di documenti che incoraggia un approccio alla scrittura basato sulla struttura dei vostri testi, non sulla loro apparenza.$\r$\n$\r$\n(^ClickNext)"
 
 ${LangFileString} TEXT_REINSTALL_TITLE "Reinstallazione"
 ${LangFileString} TEXT_REINSTALL_SUBTITLE "Scegliete se volete reinstallare i file di $(^NameDA)."
-${LangFileString} TEXT_REINSTALL_INFO "$(^NameDA) è già installato. Questo installer vi consentirà di cambiare la lingua dell'interfaccia, l'ubicazione di applicazioni esterne o di scaricare dalla rete dizionari aggiuntivi. Se volete anche reinstallare i file del programma, selezionate la casella sottostante. $(^ClickNext)"
+${LangFileString} TEXT_REINSTALL_INFO "$(^NameDA) è già installato. Questo installer vi consentirà di cambiare l'ubicazione di applicazioni esterne o di scaricare dalla rete dizionari aggiuntivi. Se volete anche reinstallare i file del programma, selezionate la casella sottostante. $(^ClickNext)"
 ${LangFileString} TEXT_REINSTALL_ENABLE "Reinstallazione dei file di $(^NameDA)"
 
 ${LangFileString} TEXT_EXTERNAL_NOPRIVILEDGES "(sono richiesti privilegi da amministratore o utente avanzato)"
@@ -82,5 +82,3 @@ ${LangFileString} TEXT_NOTINSTALLED_DICT "L'installazione del dizionario ortogra
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Crea icona sul desktop"
 ${LangFileString} TEXT_FINISH_WEBSITE "Visitate lyx.org per ultime novità, aiuto e suggerimenti"
-
-${LangFileString} UNTEXT_WELCOME "Verrete guidati nella disinstallazione di $(^NameDA). Per favore, chiudete $(^NameDA) prima di continuare.$\r$\n$\r$\nNotate che verrà disinstallato solamente LyX. Se volete disinstallare le altre applicazioni installate insieme a LyX, dovrete farlo mediante la voce corrispondente in 'Installazione applicazioni'.$\r$\n$\r$\n$_CLICK"

development/Win32/packaging/installer/lyx.nsi

@@ -1,10 +1,8 @@
 /*
 
-NSIS Script - LyX 1.5/1.6 Installer for Win32
+NSIS Script - LyX 2.0 Installer for Win32
 Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
-Requires NSIS 2.36 or later
+Compatible with NSIS 2.46
-
-Licence details for all installer scripts can be found in the file COPYING
 
 */
 
@@ -18,7 +16,6 @@ Licence details for all installer scripts can be found in the file COPYING
 !include include\nsis.nsh
 
 !include include\filelist.nsh
-!include include\langlist.nsh
 
 !include include\detection.nsh
 !include include\gui.nsh
@@ -45,7 +42,6 @@ Licence details for all installer scripts can be found in the file COPYING
 # User interface (wizard pages)
 
 !include gui\external.nsh
-!include gui\langselect.nsh
 !include gui\reinstall.nsh
 
 #--------------------------------

development/Win32/packaging/installer/settings.nsh

@@ -6,17 +6,12 @@ These typically need to be modified for each LyX release
 
 */
 
-#--------------------------------
-# Windows version on which the complier is running
-
-!define COMPILER_OS VISTA
-#!define COMPILER_OS XP
 
 #--------------------------------
 # Version number
 
-!define APP_VERSION_MAJOR 1
+!define APP_VERSION_MAJOR 2
-!define APP_VERSION_MINOR 6
+!define APP_VERSION_MINOR 0
 !define APP_VERSION_REVISION 0
 !define APP_VERSION_BUILD 0 # Start with 1 for the installer releases of each version
 
@@ -25,7 +20,7 @@ These typically need to be modified for each LyX release
 #--------------------------------
 # Installer file name
 
-# Typical names for the release are "LyX-1.5.4-1-Installer.exe" etc.
+# Typical names for the release are "LyX-2.0.0-1-Installer.exe" etc.
 
 !ifndef ExeFile
   !define /date ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer.exe"
@@ -38,22 +33,9 @@ These typically need to be modified for each LyX release
 !endif
 
 #--------------------------------
-# File names of component installers
+# MiKTeX
+# Sizes in KB
 
-!define SETUPFILE_LATEX "basic-miktex-2.7.3248.exe"
+!define SETUPFILE_LATEX "basic-miktex-2.9.3972.exe"
-!define SETUPFILE_IMAGEMAGEMAGICK "ImageMagick-6.4.1-0-Q16-windows-dll.exe"
+!define SIZE_DOWNLOAD_LATEX 141645
-!define SETUPFILE_GHOSTSCRIPT "gs861w32.exe"
+!define SIZE_LATEX 380000
-
-#--------------------------------
-# Download size of components (in KB)
-
-!define SIZE_DOWNLOAD_LATEX 78493
-!define SIZE_DOWNLOAD_IMAGEMAGICK 8565
-!define SIZE_DOWNLOAD_GHOSTSCRIPT 12469
-
-#--------------------------------
-# Approximations of space required for components (in KB)
-
-!define SIZE_LATEX 225000
-!define SIZE_IMAGEMAGICK 34500
-!define SIZE_GHOSTSCRIPT 31500

development/Win32/packaging/installer/setup/configure.nsh

@@ -45,9 +45,6 @@ Section -InstallData
   WriteRegStr SHELL_CONTEXT ${APP_REGKEY} "Version" "${APP_VERSION_NUMBER}"
 
   WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "LaTeX Path" $PathLaTeX
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "ImageMagick Path" $PathImageMagick
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "Ghostscript Path" $PathGhostscript
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETUP} "LyX Language" $LangName
 
   # Start Menu shortcut
   # There is only one shortcut to the application, so it should be in the main group
@@ -85,24 +82,11 @@ Section -Configure
 
   # Path prefix
 
-  StrCpy $PathPrefix "$INSTDIR\bin;$INSTDIR\python"
+  StrCpy $PathPrefix "$INSTDIR\bin;$INSTDIR\python;$INSTDIR\imagemagick;$INSTDIR\ghostscript"
-  
-  !ifdef BUNDLE_IMAGEMAGICK
-    StrCpy $PathImageMagick "$INSTDIR\imagemagick"
-  !endif
-  !ifdef BUNDLE_GHOSTSCRIPT
-    StrCpy $PathGhostscript "$INSTDIR\ghostscript"
-  !endif  
   
   ${If} $PathLaTeX != ""
     StrCpy $PathPrefix "$PathPrefix;$PathLaTeX"
   ${EndIf}
-  ${If} $PathGhostscript != ""
-    StrCpy $PathPrefix "$PathPrefix;$PathGhostscript"
-  ${EndIf}
-  ${If} $PathImageMagick != ""
-    StrCpy $PathPrefix "$PathPrefix;$PathImageMagick"
-  ${EndIf}
   ${If} $PathBibTeXEditor != ""
     StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor"
   ${EndIf}  
@@ -121,9 +105,6 @@ Section -Configure
 
   FileClose $DistFile
 
-  # Set language
-  WriteRegStr SHELL_CONTEXT ${APP_REGKEY_SETTINGS} "Language" $LangISOCode
-
 SectionEnd
 
 #--------------------------------

development/Win32/packaging/installer/setup/install.nsh

@@ -29,8 +29,7 @@ Section -ProgramFiles SecProgramFiles
   !insertmacro FileListLyXLauncher File "${FILES_LAUNCHER}\"  
   !insertmacro FileListQtBin File "${FILES_QT}\bin\"
   !insertmacro FileListDll File "${FILES_DEPS}\bin\"
-  !insertmacro FileListMSVCBin File "${FILES_MSVC}\"
+  !insertmacro FileListMSVC File "${FILES_MSVC}\"
-  !insertmacro FileListMSVCManifest File "..\"
   !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
   !insertmacro FileListDTLBin File "${FILES_DTL}\"
   !insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
@@ -48,8 +47,7 @@ Section -ProgramFiles SecProgramFiles
   # Components of Python
   SetOutPath "$INSTDIR\python"
   !insertmacro FileListPythonBin File "${FILES_PYTHON}\"
-  !insertmacro FileListMSVCBin File "${FILES_MSVC}\"
+  !insertmacro FileListMSVC File "${FILES_MSVC}\"
-  !insertmacro FileListMSVCManifest File "..\"  
   SetOutPath "$INSTDIR\python\Lib"
   !insertmacro FileListPythonLib File "${FILES_PYTHON}\Lib\"
   SetOutPath "$INSTDIR\python\Lib\encodings"
@@ -67,20 +65,15 @@ Section -ProgramFiles SecProgramFiles
   Pop $PythonCompileReturn # Return value
   Delete "$INSTDIR\compilepy.py"
   
-  !ifdef BUNDLE_IMAGEMAGICK
   # Components of ImageMagick
   SetOutPath "$INSTDIR\imagemagick"
   !insertmacro FileListImageMagick File "${FILES_IMAGEMAGICK}\"
-  !insertmacro FileListMSVCBin File "${FILES_MSVC}\"
+  !insertmacro FileListMSVC File "${FILES_MSVC}\"
-  !insertmacro FileListMSVCManifest File "..\"
-  !endif  
   
-  !ifdef BUNDLE_GHOSTSCRIPT
   # Components of Ghostscript
   SetOutPath "$INSTDIR\ghostscript"
   !insertmacro FileListGhostscript File "${FILES_GHOSTSCRIPT}\"
-  !insertmacro FileListMSVCBin File "${FILES_MSVC}\"
+  !insertmacro FileListMSVC File "${FILES_MSVC}\"
-  !insertmacro FileListMSVCManifest File "..\"
   
   !endif  
   
@@ -194,44 +187,16 @@ Section -LaTeX ExternalLaTeX
   !insertmacro EXTERNAL LaTeX
 SectionEnd
 
-!ifndef BUNDLE_IMAGEMAGICK
-
-Section -ImageMagick ExternalImageMagick
-  !insertmacro EXTERNAL ImageMagick
-SectionEnd
-
-!endif
-
-!ifndef BUNDLE_GHOSTSCRIPT
-
-Section -Ghostscript ExternalGhostscript
-  !insertmacro EXTERNAL Ghostscript
-SectionEnd
-
-!endif
-
 Function InitExternal
 
   # Get sizes of external component installers
   
   SectionGetSize ${ExternalLaTeX} $SizeLaTeX
-  !ifndef BUNDLE_IMAGEMAGICK
-    SectionGetSize ${ExternalImageMagick} $SizeImageMagick
-  !endif
-  !ifndef BUNDLE_GHOSTSCRIPT
-    SectionGetSize ${ExternalGhostscript} $SizeGhostscript
-  !endif
   
   # Add download size
   
   !ifndef BUNDLESETUP_MIKTEX
     IntOp $SizeLaTeX $SizeLaTeX + ${SIZE_DOWNLOAD_LATEX}
   !endif
-  !ifndef BUNDLE_IMAGEMAGICK & BUNDLESETUP_IMAGEMAGICK
-    IntOp $SizeImagemagick $SizeImagemagick + ${SIZE_DOWNLOAD_IMAGEMAGICK}
-  !endif
-  !ifndef BUNDLE_GHOSTSCRIPT & BUNDLESETUP_GHOSTSCRIPT
-    IntOp $SizeGhostscript $SizeGhostscript + ${SIZE_DOWNLOAD_GHOSTSCRIPT}
-  !endif
 
 FunctionEnd

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

@@ -15,8 +15,8 @@ Section "un.Program Files" un.SecProgramFiles
   !insertmacro FileListLyXLauncher Delete "$INSTDIR\bin\"  
   !insertmacro FileListQtBin Delete "$INSTDIR\bin\"
   !insertmacro FileListDll Delete "$INSTDIR\bin\"
-  !insertmacro FileListMSVCBin Delete "$INSTDIR\bin\"
+  !insertmacro FileListMSVC Delete "$INSTDIR\bin\"
-  !insertmacro FileListMSVCManifest Delete "$INSTDIR\bin\"
+  !insertmacro FileListMSVC2008 Delete "$INSTDIR\bin\"
   !insertmacro FileListNetpbmBin Delete "$INSTDIR\bin\"
   !insertmacro FileListDTLBin Delete "$INSTDIR\bin\"
   !insertmacro FileListDvipostBin Delete "$INSTDIR\bin\"
@@ -38,20 +38,20 @@ Section "un.Program Files" un.SecProgramFiles
   Delete "$INSTDIR\python\Lib\*.pyc"  
   RMDir "$INSTDIR\python\Lib" 
   !insertmacro FileListPythonBin Delete "$INSTDIR\python\"
-  !insertmacro FileListMSVCBin Delete "$INSTDIR\python\"
+  !insertmacro FileListMSVC Delete "$INSTDIR\python\"
-  !insertmacro FileListMSVCManifest Delete "$INSTDIR\python\" 
+  !insertmacro FileListMSVC2008 Delete "$INSTDIR\bin\"
   RMDir "$INSTDIR\python"
   
   # Components of ImageMagick
   !insertmacro FileListImageMagick Delete "$INSTDIR\imagemagick\"
-  !insertmacro FileListMSVCBin Delete "$INSTDIR\imagemagick\"
+  !insertmacro FileListMSVC Delete "$INSTDIR\imagemagick\"
-  !insertmacro FileListMSVCManifest Delete "$INSTDIR\imagemagick\"
+  !insertmacro FileListMSVC2008 Delete "$INSTDIR\bin\"
   RMDir "$INSTDIR\imagemagick"
   
   # Components of Ghostscript
   !insertmacro FileListGhostscript Delete "$INSTDIR\ghostscript\"
-  !insertmacro FileListMSVCBin Delete "$INSTDIR\ghostscript\"
+  !insertmacro FileListMSVC Delete "$INSTDIR\ghostscript\"
-  !insertmacro FileListMSVCManifest Delete "$INSTDIR\ghostscript\"
+  !insertmacro FileListMSVC2008 Delete "$INSTDIR\bin\"
   RMDir "$INSTDIR\ghostscript"
   
   # Shortcuts