-Changelog for LyX-230-1:
+Changelog for LyX-230:
- installs LyX 2.3.0
- fix installation of Arabic spell checker
- updated to MiKTeX 2.9 build 6615
+- updated to ImageMagick 7.0.7-25
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
- installs LyX 2.3.0 RC2
- updated to Qt 5.9.4
- updated to ImageMagick 7.0.7-22
+- updated to NSIS 3.0.3
Changelog for LyX-230-RC1:
${If} $6 == 1
DetailPrint "appended to $1"
${Else}
- #DetailPrint "Target was appended to $1"
+ DetailPrint "Target was appended to $1"
${EndIf}
${Else} ; If Prepend (and EnvVar is not empty),
StrCpy $0 $4;$0 ; prepend PathString
ExecWait '$PathLaTeX\tlmgr update --all'
FunctionEnd
-
-# ------------------------------
-
-Function UpdateMiKTeX
- # asks to update MiKTeX
-
- MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" /SD IDNO IDYES UpdateNow IDNO UpdateLater
- UpdateNow:
- # the update wizard is started by the miktex-update.exe
- ${if} $MultiUser.Privileges != "Admin"
- ${andif} $MultiUser.Privileges != "Power"
- # call the non-admin version
- ExecWait '"$PathLaTeX\internal\miktex-update.exe"'
- ${else}
- ${if} $MiKTeXUser != "HKCU" # call the admin version
- ExecWait '"$PathLaTeX\internal\miktex-update_admin.exe"'
- ${else}
- ExecWait '"$PathLaTeX\internal\miktex-update.exe"'
- ${endif}
- ${endif}
- UpdateLater:
-
-FunctionEnd
-
#--------------------------------
# File locations
-!define FILES_LICENSE "license.rtf"
-!define FILES_ICONS "icons"
+!define FILES_LICENSE "${FILES_GIT}\license.rtf"
+!define FILES_ICONS "${FILES_GIT}\icons"
!define FILES_PDFVIEW "${FILES_DEPS}\bin"
!define FILES_MSVC "${FILES_DEPS}\bin"
!define FILES_PERL "${FILES_DEPS}\Perl"
!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 APP_SETUPTYPE "Bundle"
!endif
-!define APP_RUN "bin\lyx.exe"
-!define BIN_LYX "lyx.exe"
+!define BIN_LYX "LyX${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.exe"
+!define APP_RUN "bin\${BIN_LYX}"
!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220"
!define APP_REGKEY_SETUP "${APP_REGKEY}\Setup"
${if} $DictCode == $R3
StrCpy $String $String -2 # delete the linebreak characters at the end
- # Download hunspell dictionaries,
- # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
- FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
-
- ${For} $4 1 22 # there are 22 mirrors in the file
- FileRead $R4 $Search # $Search is now the mirror
- StrCpy $Search $Search -2 # delete the linebreak characters at the end
- Push $R0
- inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
- Pop $R0
- ${if} $R0 == "OK"
- ${ExitFor}
- ${endif}
- ${Next}
-
- FileClose $R4
+ # Download hunspell dictionaries
+ Push $R0
+ inetc::get /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
+ Pop $R0
# if download failed
${if} $R0 != "OK"
- MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)"
+ MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed): $R0"
Goto abortinstall
${endif}
${endif} # end if $DictCode == $R3
${Next}
FileClose $R5
- abortinstall:
- Delete "$INSTDIR\$String"
+ abortinstall:
+ Delete "$INSTDIR\$String"
FunctionEnd
${if} $ThesCode == $R3
StrCpy $String $String -2 # delete the linebreak characters at the end
- # Download thesaurus files,
- # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
- FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
-
- ${For} $4 1 22 # there are 22 mirrors in the file
- FileRead $R4 $Search # $Search is now the mirror
- StrCpy $Search $Search -2 # delete the linebreak characters at the end
- Push $R0
- inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
- Pop $R0
- ${if} $R0 == "OK"
- ${ExitFor}
- ${endif}
- ${Next}
-
- FileClose $R4
+ # Download thesaurus files
+ Push $R0
+ inetc::get /POPUP /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
+ Pop $R0
# if download failed
${if} $R0 != "OK"
- MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed)"
+ MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed): $R0"
Goto abortinstall
${endif}
${endif} # end if $ThesCode == $R3
${Next}
FileClose $R5
- abortinstall:
- Delete "$INSTDIR\$String"
+ abortinstall:
+ Delete "$INSTDIR\$String"
FunctionEnd
!macro FileListLyXBin COMMAND DIRECTORY
- ${FILE}lyx.exe"
- ${FILE}tex2lyx.exe"
+ ${FILE}${BIN_LYX}"
+ ${FILE}tex2lyx${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.exe"
!macroend
!macro FileListQtBin COMMAND DIRECTORY
+ ${FILE}Qt5Concurrent.dll"
${FILE}Qt5Core.dll"
${FILE}Qt5Gui.dll"
+ ${FILE}Qt5Network.dll"
+ ${FILE}Qt5OpenGL.dll"
+ ${FILE}Qt5PrintSupport.dll"
${FILE}Qt5Svg.dll"
${FILE}Qt5Widgets.dll"
${FILE}Qt5WinExtras.dll"
!macro FileListQtImageformats COMMAND DIRECTORY
${FILE}qgif.dll"
- ${FILE}qicns.dll"
${FILE}qico.dll"
${FILE}qjpeg.dll"
${FILE}qsvg.dll"
- ${FILE}qtga.dll"
+ ${FILE}qicns.dll"
${FILE}qtiff.dll"
${FILE}qwbmp.dll"
${FILE}qwebp.dll"
!macroend
+!macro FileListQtStyles COMMAND DIRECTORY
+
+ ${FILE}qwindowsvistastyle.dll"
+
+!macroend
+
+!macro FileListMinGW COMMAND DIRECTORY
+
+ # Files needed for MinGW
+ ${FILE}iconv.dll"
+ ${FILE}libbz2-1.dll"
+ ${FILE}libfreetype-6.dll"
+ ${FILE}libgcc_s_sjlj-1.dll"
+ ${FILE}libglib-2.0-0.dll"
+ ${FILE}libharfbuzz-0.dll"
+ ${FILE}libintl-8.dll"
+ ${FILE}libjpeg-62.dll"
+ ${FILE}libpcre-1.dll"
+ ${FILE}libpcre2-16-0.dll"
+ ${FILE}libpng16-16.dll"
+ ${FILE}libstdc++-6.dll"
+ ${FILE}libtiff-5.dll"
+ ${FILE}libwinpthread-1.dll"
+ ${FILE}libwebp-7.dll"
+ ${FILE}libwebpdemux-2.dll"
+ ${FILE}zlib1.dll"
+
+!macroend
+
!macro FileListMSVC COMMAND DIRECTORY
# Files needed for MSVC 2015
+ # Seem to be installed for dependencies
${FILE}concrt140.dll"
${FILE}msvcp140.dll"
${FILE}vcamp140.dll"
${FILE}vccorlib140.dll"
${FILE}vcomp140.dll"
${FILE}vcruntime140.dll"
-
+
!macroend
!macro FileListNetpbmBin COMMAND DIRECTORY
!macroend
-!macro FileListeLyXer COMMAND DIRECTORY
-
- ${FILE}elyxer.py"
- ${FILE}lyx.css"
- ${FILE}math.css"
- ${FILE}math2html.py"
- ${FILE}toc.css"
-
-!macroend
-
!macro FileListPDFViewBin COMMAND DIRECTORY
${FILE}pdfview.exe"
!define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"
+Function CheckUpdateMiKTeX
+${if} $LatexInstalled != "MiKTeX"
+ #MessageBox MB_OK "No MiKTeX?"
+ Return
+${EndIf}
+${if} ${SETUPTYPE} == BUNDLE
+ Return
+${EndIf}
+
+!define MUI_PAGE_HEADER_TEXT "$(MikTeXUpdateHeader)"
+!define MUI_PAGE_HEADER_SUBTEXT " "
+
+!include nsDialogs.nsh
+nsDialogs::Create 1018
+Pop $R0
+${If} $R0 == error
+ Abort
+${EndIf}
+
+${NSD_CreateLabel} 0 0 100% 60% "$(MiKTeXUpdateMsg)"
+Pop $R0
+nsDialogs::Show
+
+FunctionEnd
+
#--------------------------------
# Pages
# Welcome page
!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME)
!insertmacro MUI_PAGE_WELCOME
+
# Show the license.
!insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"
+Page custom CheckUpdateMiKTeX
+
# Decision if it should be installed as admin or not
!insertmacro MULTIUSER_PAGE_INSTALLMODE
($\"$AppPre\erabiltzailea\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
zuretzako edo erabiltzaile guztientzako (administratzailea bazara).'
${LangFileString} SecUnProgramFilesDescription "Desinstalatu LyX eta bere osagai guztiak."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "MiKTeX-en aldaketak direla-eta, LyX-en bertsioen instalazioa 2.2.3 baino aurreratuagoa izan daiteke. MiKTeX-ek ezin du bertsio partziala sortu.$\r$\n\
+$\r$\n\
+Oraindik ez baduzu egin, Lyk bertsio berria instalatu aurretik, MiKTeX eguneratzeko azken bertsioa gomendatzen dizugu.$\r$\n\
+$\r$\n\
+Orain instalazioarekin jarraitu edo bertan behera utzi dezakezu MiKTeX eguneratzeko.$\r$\n\
+$\r$\n\
+(Barkatu itzulpen automatikorako.)"
+
+${LangFileString} MiKTeXUpdateHeader "ABISUA: MiKTeX aldaketak"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
de tots els usuaris.'
${LangFileString} SecUnProgramFilesDescription "Desinstal·la el LyX i tots els seus components."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "A causa dels canvis en MiKTeX, la instal·lació de versions de LyX més tard de 2.2.3 pot provocar una actualització parcial que no permet fer servir MiKTeX.$\r$\n\
+$\r$\n\
+Si encara no ho heu fet, us recomanem que actualitzeu MiKTeX a la versió més recent abans d'instal·lar una nova versió de LyX.$\r$\n\
+$\r$\n\
+Ara podeu continuar amb la instal·lació o cancel·lar-lo per poder actualitzar MiKTeX.$\r$\n\
+$\r$\n\
+(Ho sento per la traducció automatitzada.)"
+
+${LangFileString} MiKTeXUpdateHeader "ADVERTIMENT: canvis MiKTeX"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
pro všechny uživatele.'
${LangFileString} SecUnProgramFilesDescription "Odinstalovat LyX a všechny jeho komponenty."
+
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Kvůli změnám MiKTeX-u mohly starší instalace LyX-u (2.2.3) způsobit částečnou aktualizaci, která MiKTeX-u znemožní normální fungovaní.$\r$\n\
+$\r$\n\
+Pokud jste tak již neučinili, doporučujeme abyste si sami aktualizovali poslední verzi MiKTeX-u před instalací LyX-u.$\r$\n\
+$\r$\n\
+Nyní můžete buďto pokračovat v instalaci, anebo ji stornovat za účelem aktualizace MikTeX-u."
+
+${LangFileString} MiKTeXUpdateHeader "Upozornění: Změny MiKTeX-u"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
for alle brugere.'
${LangFileString} SecUnProgramFilesDescription "Afinstallerer LyX og alle dets komponenter."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "På grund af ændringer i MiKTeX kan installation af versioner af LyX senere end 2.2.3 forårsage en delvis opdatering, der gør MiKTeX ubrugelig.$\r$\n\
+$\r$\n\
+Hvis du ikke allerede har gjort det, anbefaler vi, at du opdaterer MiKTeX til den nyeste version, inden du installerer en ny version af LyX.$\r$\n\
+$\r$\n\
+Du kan nu enten fortsætte med installationen eller annullere det, så du kan opdatere MiKTeX.$\r$\n\
+$\r$\n\
+(Undskyld for den automatiske oversættelse.)"
+
+${LangFileString} MiKTeXUpdateHeader "ADVARSEL: MiKTeX Ændringer"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
voor alle gebruikers.'
${LangFileString} SecUnProgramFilesDescription "Verwijder LyX en alle bijbehorende onderdelen."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Als gevolg van wijzigingen in MiKTeX kan de installatie van versies van LyX later dan 2.2.3 een gedeeltelijke update veroorzaken waardoor MiKTeX onbruikbaar wordt.$\r$\n\
+$\r$\n\
+Als u dit nog niet hebt gedaan, raden we u aan MiKTeX bij te werken naar de nieuwste versie voordat u een nieuwe versie van LyX installeert.$\r$\n\
+$\r$\n\
+U kunt nu doorgaan met de installatie of deze annuleren, zodat u MiKTeX kunt bijwerken.$\r$\n\
+$\r$\n\
+(Sorry voor de automatische vertaling.)"
+
+${LangFileString} MiKTeXUpdateHeader "WAARSCHUWING: MiKTeX-wijzigingen"
(folder $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
for you or for all users (if you are admin).'
${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Due to changes in MiKTeX, installation of versions of LyX later than 2.2.3 can cause a partial update that makes MiKTeX unusable.$\r$\n\
+$\r$\n\
+If you have not already done so, we recommend that you update MiKTeX to the latest version prior to installing a new version of LyX.$\r$\n\
+$\r$\n\
+You may now either proceed with the installation or cancel it so you can update MiKTeX."
+
+${LangFileString} MiKTeXUpdateHeader "WARNING: MiKTeX Changes"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
pour tous les utilisateurs.'
${LangFileString} SecUnProgramFilesDescription "Désinstaller LyX et tous ses composants."
+
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "À la suite de modifications de MiKTeX, l'installation de versions de LyX postérieures à 2.2.3 peut provoquer une mise à jour partielle qui rend MiKTeX inutilisable.$\r$\n\
+$\r$\n\
+Si ce n'est déjà fait, nous vous recommandons de mettre à jour MiKTeX à la dernière version disponible avant d'installer une nouvelle version de LyX.$\r$\n\
+$\r$\n\
+Vous pouvez maintenant continuer l'installation ou annuler celle-ci afin de mettre à jour MiKTeX. "
+
+${LangFileString} MiKTeXUpdateHeader "AVERTISSEMENT : modifications de MiKTeX"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
de todos os usuários.'
${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todos os seus componentes."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Debido aos cambios en MiKTeX, a instalación de versións de LyX máis tarde de 2.2.3 pode causar unha actualización parcial que fai que MiKTeX non se poida usar.$\r$\n\
+$\r$\n\
+Se aínda non o fixeches, recomendamos que actualice MiKTeX á última versión antes de instalar unha nova versión de LyX.$\r$\n\
+$\r$\n\
+Agora podes continuar coa instalación ou cancelala para que poidas actualizar MiKTeX.$\r$\n\
+$\r$\n\
+(Sentímolo pola tradución automática)."
+
+${LangFileString} MiKTeXUpdateHeader "AVISO: Cambios MiKTeX"
(Ordner $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\")$\r$\n\
für Sie oder für alle Benutzer (wenn Sie Admin sind).'
${LangFileString} SecUnProgramFilesDescription "Deinstalliert LyX und all seine Komponenten."
+
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Aufgrund von Änderungen in MikTeX kann es bei Installationen von LyX in Versionen neuer als 2.2.3 zu unvollständigen Aktualisierungen kommen, aufgrund derer MikTeX nicht mehr funktioniert.$\r$\n\
+$\r$\n\
+Falls Sie es noch nicht getan haben, empfehlen wir, dass Sie MikTeX aktualisieren, bevor Sie LyX installieren.$\r$\n\
+$\r$\n\
+Sie können nun entweder mit der Installation fortfahren oder hierabbrechen, um zunächst MikTeX zu aktualisieren."
+
+${LangFileString} MiKTeXUpdateHeader "ACHTUNG: MikTeX-Änderungen"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
minden felhasználónál.'
${LangFileString} SecUnProgramFilesDescription "A LyX és minden komponensének eltávolítása."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "A MiKTeX változásai miatt a LyX későbbi verzióinak telepítése a 2.2.3-os verzión keresztül részleges frissítést eredményezhet, ami a MiKTeX-t használhatatlanná teszi.$\r$\n\
+$\r$\n\
+Ha még nem tette meg, javasoljuk, hogy frissítse a MiKTeX-et a legújabb verzióra a LyX új verziójának telepítése előtt.$\r$\n\
+$\r$\n\
+Mostantól folytathatja a telepítést, vagy törölheti azt, így frissítheti a MiKTeX-et.$\r$\n\
+$\r$\n\
+(Elnézést az automatizált fordításért.)"
+
+${LangFileString} MiKTeXUpdateHeader "FIGYELEM: MiKTeX változások"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
untuk semua pengguna.'
${LangFileString} SecUnProgramFilesDescription "Penghapusan LyX serta semua komponen yang ada."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Karena perubahan pada MiKTeX, pemasangan versi LyX lebih lambat dari 2.2.3 dapat menyebabkan pembaruan parsial yang membuat MiKTeX tidak dapat digunakan.$\r$\n\
+$\r$\n\
+Jika Anda belum melakukannya, kami menyarankan Anda memperbarui MiKTeX ke versi terbaru sebelum menginstal versi baru LyX.$\r$\n\
+$\r$\n\
+Anda sekarang dapat melanjutkan instalasi atau membatalkannya sehingga Anda dapat memperbarui MiKTeX.$\r$\n\
+$\r$\n\
+(Maaf untuk terjemahan otomatis.)"
+
+${LangFileString} MiKTeXUpdateHeader "PERINGATAN: Perubahan MiKTeX"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
per tutti gli utenti.'
${LangFileString} SecUnProgramFilesDescription "Rimuove LyX e tutti i suoi componenti."
+
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "A causa di cambiamenti in MiKTeX, l'installazione di versioni di LyX successive alla 2.2.3 può causare un aggiornamento parziale che rende MiKTeX inutilizzabile.$\r$\n\
+$\r$\n\
+Se non lo hai già fatto, ti consigliamo di aggiornare MiKTeX alla versione più recente prima di installare una nuova versione di LyX.$\r$\n\
+$\r$\n\
+Ora puoi procedere con l'installazione o cancellarla per poter aggiornare MiKTeX.$\r$\n\
+$\r$\n\
+(Ci scusiamo per la traduzione automatica.)"
+
+${LangFileString} MiKTeXUpdateHeader "ATTENZIONE: modifiche MiKTeX"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
を削除します。'
${LangFileString} SecUnProgramFilesDescription "LyXとすべての附属コンポーネントの導入解除を行います。"
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "MiKTeXが変更されたため、2.2.3より後のバージョンのLyXをインストールすると、MiKTeXを使用できなくする部分的な更新が発生する可能性があります。$\r$\n\
+$\r$\n\
+LyXの新しいバージョンをインストールする前に、MiKTeXを最新のバージョンにアップデートすることをお勧めします。$\r$\n\
+$\r$\n\
+これで、インストールを続行するか、キャンセルしてMiKTeXを更新することができます。$\r$\n\
+$\r$\n\
+自動翻訳には申し訳ありません"
+
+${LangFileString} MiKTeXUpdateHeader "警告：MiKTeXの変更点"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
for alle brukere.'
${LangFileString} SecUnProgramFilesDescription "Avinstallerer LyX og alle delkomponenter."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "På grunn av endringar i MiKTeX kan installasjon av LyX versjonar nyare enn 2.2.3 føre til ein delvis oppdatering som gjer MiKTeX ubrukeleg.$\r$\n\
+$\r$\n\
+Dersom du ikkje har gjort det vil vi foreslå at du oppdaterer MiKTeX til siste versjon, før du installerer siste versjon av LyX. $\r$\n\
+$\r$\n\
+Du kan no velje å fortsetje med installasjonen eller avbryte for å oppdatere MiKTeX."
+
+${LangFileString} MiKTeXUpdateHeader "ÅTVARING: Endringar i MiKTeX"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
wszystkim użytkownikom.'
${LangFileString} SecUnProgramFilesDescription "Deinstalacja LyX i wszystkich jego komponentów."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "W efekcie zmian w MiKTeX, instalacja wersji LyX starszej niż 2.2.3 może powodować częściową aktualizację, która uczyni MiKTeX niesprawnym.$\r$\n\
+$\r$\n\
+Jeżeli jeszcze tego nie uczyniłeś, zalecamy aktualizację MiKTeX do najnowszej wersji przed instalacją nowej wersji LyX.$\r$\n\
+$\r$\n\
+Teraz albo możesz kontynuować instalację lub przerwać, aby móc zaktualizować MiKTeX."
+
+${LangFileString} MiKTeXUpdateHeader "UWAGA: Zmiany w MiKTeX"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
de todos os utilizadores.'
${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todas as suas componentes."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Devido a alterações no MiKTeX, a instalação de versões do LyX posteriores à 2.2.3 pode causar uma atualização parcial que torna o MiKTeX inutilizável.$\r$\n\
+$\r$\n\
+Se você ainda não fez isso, recomendamos que atualize o MiKTeX para a versão mais recente antes de instalar uma nova versão do LyX.$\r$\n\
+$\r$\n\
+Agora você pode continuar com a instalação ou cancelá-la para poder atualizar o MiKTeX.$\r$\n\
+$\r$\n\
+(Desculpe pela tradução automática.)"
+
+${LangFileString} MiKTeXUpdateHeader "AVISO: Alterações no MiKTeX"
(pasta $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
para você ou para todos os usuários (se você for um administrador)).'
${LangFileString} SecUnProgramFilesDescription "Desinstalar o LyX e todos os seus componentes."
+
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Devido a alterações no MiKTeX, a instalação de versões do LyX posteriores à 2.2.3 pode causar uma atualização parcial que torna o MiKTeX inutilizável.$\r$\n\
+$\r$\n\
+Se você ainda não fez isso, recomendamos que atualize o MiKTeX para a versão mais recente antes de instalar uma nova versão do LyX.$\r$\n\
+$\r$\n\
+Agora você pode continuar com a instalação ou cancelá-la para poder atualizar o MiKTeX.$\r$\n\
+$\r$\n\
+(Desculpe pela tradução automática.)"
+
+${LangFileString} MiKTeXUpdateHeader "AVISO: Alterações no MiKTeX"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
pentru toţi utilizatorii.'
${LangFileString} SecUnProgramFilesDescription "Dezinstalaţi programul LyX şi toate componentele lui."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\
+$\r$\n\
+Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\
+$\r$\n\
+Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\
+$\r$\n\
+(Ne pare rău pentru traducerea automată.)"
+
+${LangFileString} MiKTeXUpdateHeader "AVERTISMENT: MiKTeX Modificări"
(каталог $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
для вас или для всех пользователей (если вы администратор).'
${LangFileString} SecUnProgramFilesDescription "Удалить LyX и все его компоненты."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Из-за изменений в MiKTeX установка версий LyX позже 2.2.3 может привести к частичному обновлению, что делает MiKTeX непригодным.$\r$\n\
+$\r$\n\
+Если вы еще этого не сделали, мы рекомендуем вам обновить MiKTeX до последней версии до установки новой версии LyX.$\r$\n\
+$\r$\n\
+Вы можете либо продолжить установку, либо отменить ее, чтобы обновить MiKTeX.$\r$\n\
+$\r$\n\
+(Извините за автоматизированный перевод.)"
+
+${LangFileString} MiKTeXUpdateHeader "ПРЕДУПРЕЖДЕНИЕ: Изменения в MiKTeX"
LaTeX-distribúciu, ktorá by mala byť používaná LyXom.\r\n\
Bez LaTeXu, LyX nedokáže produkovať dokumenty!\r\n\
\r\n\
- Inštalatér detegoval LaTeX-distribúciu \
+ Inštalatér objavil LaTeX-distribúciu \
$\"$LaTeXName$\" na vašom systéme. Dolu je zobrazená jeho cesta.'
${LangFileString} EnterLaTeXFolderNone 'Nastavte dolu cestu k $\"latex.exe$\". Tým nastavíte, ktorá \
LaTeX-distribúcia má byť používaná LyXom.\r\n\
${LangFileString} InvalidLaTeXFolder 'Súbor $\"latex.exe$\" nie je na špecifikovanej ceste.'
${LangFileString} LatexInfo 'Teraz štartuje inštalatér LaTeX distribúcie $\"MiKTeX$\".$\r$\n\
- Na inštalovanie programu tlačte $\"Next$\" v okne inštalátora až inštalácia začne.$\r$\n\
+ Na inštalovanie programu stlačte $\"Next$\" v okne inštalátora až inštalácia začne.$\r$\n\
$\r$\n\
!!! Prosím použite všetky štandardné možnosti inštalatéra MiKTeX !!!'
${LangFileString} UnNotInRegistryLabel "Nemôžem nájsť LyX v registre.$\r$\n\
Skratky na pracovnej ploche a v štartovacom Menu sa nedajú odstrániť."
${LangFileString} UnInstallRunning "Najprv treba zavrieť LyX!"
-${LangFileString} UnNotAdminLabel "Pre odinštaláciu LyX potrebujete administrátorské práva!"
+${LangFileString} UnNotAdminLabel "Pre odinštaláciu LyXu potrebujete administrátorské práva!"
${LangFileString} UnReallyRemoveLabel "Ste si istý, že chcete kompletne odinštalovať LyX a všetky jeho súčiastky?"
${LangFileString} UnLyXPreferencesTitle 'LyXove užívateľské nastavenia'
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
pre všetkých užívateľov (keď máte administrátorské práva).'
${LangFileString} SecUnProgramFilesDescription "Odinštaluj LyX a všetky jeho súčiastky."
+
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Kvôli zmenám MiKTeX-u, inštalácia verzie LyX-u novšej ako 2.2.3 môže byť dôvodom parciálnej aktualizácie. To by mohlo zrobiť MiKTeX nepoužiteľným.$\r$\n\
+$\r$\n\
+Ak ste to doteraz ešte neurobili, odporúčame aktualizovať MiKTeX na jeho najnovšiu verziu pred inštaláciou novej LyX- verzie.$\r$\n\
+$\r$\n\
+Teraz môžte buď s inštaláciou pokračovať, alebo ju zrušiť aby ste mohli aktualizovať MiKTeX."
+
+${LangFileString} MiKTeXUpdateHeader "VAROVANIE: Zmeny MiKTeX-u"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
de todos los usuarios.'
${LangFileString} SecUnProgramFilesDescription "Desinstala LyX y todos sus componentes."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Debido a cambios en MiKTeX, la instalación de versiones de LyX posteriores a la 2.2.3 puede causar una actualización parcial que hace que MiKTeX no se pueda utilizar.$\r$\n\
+$\r$\n\
+Si aún no lo ha hecho, le recomendamos que actualice MiKTeX a la última versión antes de instalar una nueva versión de LyX.$\r$\n\
+$\r$\n\
+YAhora puede continuar con la instalación o cancelarla para que pueda actualizar MiKTeX.$\r$\n\
+$\r$\n\
+(Perdón por la traducción automatizada.)"
+
+${LangFileString} MiKTeXUpdateHeader "ADVERTENCIA: Cambios de MiKTeX"
(katalog $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
för dig eller för alla användare (om du är admin).'
${LangFileString} SecUnProgramFilesDescription "Avinstallera LyX och alla dess komponenter."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "På grund av ändringar i MiKTeX kan installering av LyX senare än version 2.2.3 orsaka en delvis uppdatering som gör MiKTeX oanvändbar.$\r$\n\
+$\r$\n\
+Om du inte redan har gjort det så rekommenderar vi att du uppdaterar MiKTeX till den senaste versionen innan installering av en ny version av LyX.$\r$\n\
+$\r$\n\
+Du kan nu antingen fortsätta med installeringen eller avbryta den så du kan uppdatera MiKTeX."
+
+${LangFileString} MiKTeXUpdateHeader "Varning: MiKTeX-ändringar"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
for all users.'
${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "MiKTeX'teki değişikliklerden dolayı, LyX sürümlerinin 2.2.3'den sonraki sürümleri, MiKTeX'i kullanılamaz hale getiren kısmi bir güncelleştirmeye neden olabilir.$\r$\n\
+$\r$\n\
+Henüz yapmadıysanız, yeni bir LyX sürümü yüklemeden önce MiKTeX'i en son sürüme güncellemenizi öneririz.$\r$\n\
+$\r$\n\
+Artık yükleme ile devam edebilir veya iptal edebilirsiniz, böylece MiKTeX'i güncelleyebilirsiniz.$\r$\n\
+$\r$\n\
+(Otomatik çeviri için özür dilerim.)"
+
+${LangFileString} MiKTeXUpdateHeader "UYARI: MiKTeX Değişiklikleri"
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
для всіх користувачів.'
${LangFileString} SecUnProgramFilesDescription "Вилучити LyX і всі його компоненти."
+
+# MikTeX Update Stuff
+${LangFileString} MiKTeXUpdateMsg "Через зміни у MiKTeX встановлення версій LyX, випущених після версії 2.2.3, може спричинити часткове оновлення, яке зробить MiKTeX непридатним до користування.$\r$\n\
+$\r$\n\
+Якщо ви ще цього не зробили, рекомендуємо вам оновити MiKTeX до найсвіжішої версії до встановлення нової версії LyX.$\r$\n\
+$\r$\n\
+Тепер ви можете або продовжити встановлення LyX, або скасувати його для оновлення MiKTeX."
+
+${LangFileString} MiKTeXUpdateHeader "УВАГА: Зміни у MiKTeX"
!define APP_VERSION_REVISION 0
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise ""
-!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 005 # Start with 1 for the installer releases of each version
!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
# File locations
# !!! you need to adjust them to the folders in your Windows system !!!
-!define FILES_LYX "D:\LyXPackage2.3\LyX"
-!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
-!define FILES_QT "C:\Qt\Qt5.9.4\5.9.4\msvc2015"
+!define FILES_BASE "C:\Users\rikih\LyX"
+!define FILES_GIT "${FILES_BASE}\git\development\Win32\packaging\installer"
+!define FILES_LYX "${FILES_BASE}\LyX23"
+!define FILES_DEPS "${FILES_BASE}\Dependencies"
+!define FILES_QT "${FILES_BASE}\LyX23"
!define ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\tex"
!define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "7.0.7"
-
+
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
+ !define MiKTeXInstall "$INSTDIR\basic-miktex-2.9.6643.exe"
+ !define MiKTeXInstaller "${FILES_BASE}\basic-miktex-2.9.6643.exe"
!endif
-
SetOutPath "$INSTDIR\Resources"
- # ask to update MiKTeX
- ${if} $LaTeXInstalled == "MiKTeX"
- Call UpdateMiKTeX # function from latex.nsh
# install all necessary packages at once because this is much faster then to install the packages one by one
DetailPrint $(TEXT_CONFIGURE_LYX)
${if} $MultiUser.Privileges != "Admin"
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"'
${endif}
${endif}
- ${endif}
DetailPrint $(TEXT_CONFIGURE_LYX)
nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
SetOutPath "$INSTDIR\bin"
!insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
!insertmacro FileListQtBin File "${FILES_QT}\bin\"
- !insertmacro FileListMSVC File "${FILES_MSVC}\"
+ !insertmacro FileListMinGW File "${FILES_LYX}\bin\"
!insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
!insertmacro FileListDTLBin File "${FILES_DTL}\"
!insertmacro FileListRsvg File "${FILES_RSVG}\"
# Qt plugin DLLs
SetOutPath "$INSTDIR\bin\imageformats"
- !insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
+ !insertmacro FileListQtImageformats File "${FILES_QT}\bin\imageformats\"
SetOutPath "$INSTDIR\bin\iconengines"
- !insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\"
+ !insertmacro FileListQtIconengines File "${FILES_QT}\bin\iconengines\"
SetOutPath "$INSTDIR\bin\platforms"
- !insertmacro FileListQtPlatforms File "${FILES_QT}\plugins\platforms\"
+ !insertmacro FileListQtPlatforms File "${FILES_QT}\bin\platforms\"
+ SetOutPath "$INSTDIR\bin\styles"
+ !insertmacro FileListQtStyles File "${FILES_QT}\bin\styles\"
# Resources
SetOutPath "$INSTDIR"
# recursively copy all files under Resources
File /r "${FILES_LYX}\Resources"
+ File /r "${FILES_DEPS}\Resources"
!if ${SETUPTYPE} == BUNDLE
- # extract the MiKTeX installer
- File /r "${FILES_LYX}\external"
+ # include the MiKTeX installer
+ File ${MiKTeXInstaller}
# install MiKTeX if not already installed
Call InstallMiKTeX # function from LaTeX.nsh
SetOutPath "$INSTDIR"
# recursively copy all files under Python
File /r "${FILES_PYTHON}"
- # register .py files if necessary
+#FIXME We probably should not do this, as dicussed on the list.
+ # register .py files if necessary
ReadRegStr $0 SHCTX "Software\Classes\Python.File\shell\open\command" ""
${if} $0 == "" # if nothing was found
WriteRegStr SHCTX "Software\Classes\Python.File\shell\open\command" "" '"$INSTDIR\Python\python.exe" "%1" %*'
WriteRegStr SHCTX "Software\Classes\Python.File" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to test if they were registered by this LyX version
${endif}
- # Compile all Pyton files to byte-code
+ # Compile all Python files to byte-code
# The user using the scripts may not have write access
FileOpen $PythonCompileFile "$INSTDIR\compilepy.py" w
FileWrite $PythonCompileFile "import compileall$\r$\n"
StrCpy $GhostscriptPath "$INSTDIR\ghostscript\bin"
${endif}
- # install eLyXer
- SetOutPath "$INSTDIR\Python\Lib"
- !insertmacro FileListeLyXer File "${FILES_ELYXER}\"
-
# install unoconv
SetOutPath "$INSTDIR\Python\Lib"
!insertmacro FileListUnoConv File "${FILES_UNOCONV}\"
projects / features.git / commitdiff