commit 7b47b9e11bd3d3eda993e8183a1609112bef047f
Author: Uwe Stöhr <[email protected]>
Date: Thu Jan 26 02:19:27 2017 +0100
Win installer: fix 2 bugs and update libraries
---
.../Win32/packaging/installer/ChangeLog.txt | 26 +++++++++++++++----
development/Win32/packaging/installer/Readme.txt | 2 +-
.../packaging/installer/include/dictionaries.nsh | 26 ++++++++++----------
.../Win32/packaging/installer/include/init.nsh | 10 ++++----
development/Win32/packaging/installer/settings.nsh | 12 ++++----
5 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index ba767b8..b6df3a2 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,18 @@
-Changelog for LyX-222-3:
+Changelog for LyX-222-4:
+- fix bug that spell checker for Vietnamese was not installed
+- fix bug that thesaurus for Ukrainian was not installed
+- updated to MiKTeX 2.9 build 6219 (fixes problems with the update of LaTeX
packages)
+- updated to Python 2.7.13
+- updated to ImageMagick 7.0.4-5
+- updated to JabRef 3.8.1
+- updated to Perl 5.22.3.1
+- updated thesaurus for Ukrainian
+- updated spell checker dictionaries for English (CA, GB and US) and Ukrainian
+ (To benefit from them you must uninstall an already installed LyX 2.2.x and
+ then use this installer.)
+
+
+Changelog for LyX-222-3:
- updated to MiKTeX 2.9 build 6161
(should fix all compilation errors you might have encountered recently
with your LyX files)
@@ -70,8 +84,8 @@ Changelog for LyX.220-1:
- updated to ImageMagick 6.9.4-4
- updated to JabRef 3.3
- new thesaurus for Norwegian (Nynorsk)
-- updated thesaurus for English (US) and Norwegian (Bokmal)
-- updated spell-checker dictionary for English (AU and GB), Norwegian (Bokmal
and Nynorsk) and Scottish
+- updated thesaurus for English (US) and Norwegian (Bokmål)
+- updated spell-checker dictionary for English (AU and GB), Norwegian (Bokmål
and Nynorsk) and Scottish
(To benefit from it you must uninstall an already installed LyX 2.2.0 and
then use this installer.)
@@ -160,7 +174,7 @@ Changelog for LyX-212-2:
- fix problem that some LaTeX language packages were not installed
automatically
leading to LaTeX errors when compiling LyX documents
- new spell checker for Turkish
-- updated spell-checker dictionaries for English, Norwegian(Bokmal), Portuguese
+- updated spell-checker dictionaries for English, Norwegian(Bokmål), Portuguese
and Scottish
(To benefit from them you must uninstall an already installed LyX 2.1.x and
then use this installer.)
@@ -240,7 +254,7 @@ Changelog for LyX-207:
Changelog for LyX-206-3:
- XeTeX support for Arabic and Farsi will now
automatically be installed to MiKTeX
-- updated spell-checker dictionary for Norwegian(Bokmal)
+- updated spell-checker dictionary for Norwegian(Bokmål)
Changelog for LyX-206-2:
@@ -263,7 +277,7 @@ Changelog for LyX-206-1:
Slovakian and Swedish
(To benefit from them you must uninstall an already installed LyX 2.0.x and
then use this installer.)
-- updated thesaurus for Italian, Norwegian(Bokmal), Portuguese, Romanian,
+- updated thesaurus for Italian, Norwegian(Bokmål), Portuguese, Romanian,
Slovakian and Slovenian
(need to reinstall LyX to benefit from this)
- updated to Python 2.7.4
diff --git a/development/Win32/packaging/installer/Readme.txt
b/development/Win32/packaging/installer/Readme.txt
index 46a984e..8ab4e49 100644
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -7,7 +7,7 @@
!define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015"
!define FILES_QT "C:\LyX-Installer\LyXPackage\LyX"
3. install the latest version 3.x of NSIS
(http://nsis.sourceforge.net/Download)
-4. install the NSIS Large Strings extension
(http://nsis.sourceforge.net/Special_Builds)
+4. install the NSIS Large Strings build
(http://nsis.sourceforge.net/Special_Builds)
(extract the extension ZIP file in your NSIS installation folder and this
way overwrite some files)
5. open the file FindProcDLL.zip (that is part of this bundle),
extract from it the file FindProc.dll to the folder \Plugins\x86-ansi of
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index efac5c1..242dc18 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -28,11 +28,11 @@ Function FindDictionaries
# read out the possible spell-checker filenames from the file
FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${for} $5 1 71
- # the file has 142 lines, but we only need to check for one of the 2
dictionary files per language
+ ${for} $5 1 72
+ # the file has 144 lines, but we only need to check for one of the 2
dictionary files per language
# therefore check only for every second line
- FileRead $R5 $String # skip the .aff file
- FileRead $R5 $String # $String is now the .dic filename
+ FileRead $R5 $String # skip the .aff file
+ FileRead $R5 $String # $String is now the .dic filename
StrCpy $String $String -2 # remove the linebreak characters
StrCpy $R3 $String -4 # $R3 is now the dictionary language code
${if} ${FileExists} "$INSTDIR\Resources\dicts\$String"
@@ -43,11 +43,11 @@ Function FindDictionaries
# read out the possible thesaurus filenames from the file
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${for} $5 1 26
- # the file has 52 lines, but we only need to check for one of the 2
dictionary files per language
+ ${for} $5 1 27
+ # the file has 54 lines, but we only need to check for one of the 2
thesaurus files per language
# therefore check only for every second line
- FileRead $R5 $String # $String is now the dictionary name
- FileRead $R5 $String # $String is now the dictionary name
+ FileRead $R5 $String # $String is now the dictionary name
+ FileRead $R5 $String # $String is now the dictionary name
StrCpy $String $String -2 # remove the linebreak characters
StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code
${if} ${FileExists} "$INSTDIR\Resources\thes\$String"
@@ -66,7 +66,7 @@ Function DownloadHunspellDictionaries
# read out the locations from the file
FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${For} $5 1 142 # the file has 142 lines
+ ${For} $5 1 144 # the file has 144 lines
FileRead $R5 $String # $String is now the dictionary name
StrCpy $R3 $String -6 # $R3 is now the dictionary language code
@@ -112,14 +112,14 @@ Function DownloadThesaurusDictionaries
# read out the locations from the file
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${For} $5 1 52 # the file has 52 lines
+ ${For} $5 1 54 # the file has 52 lines
- FileRead $R5 $String # $String is now the dictionary name
- StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code
+ FileRead $R5 $String # $String is now the thesaurus name
+ StrCpy $R3 $String 5 3 # $R3 is now the thesaurus language code
${if} $ThesCode == $R3
StrCpy $String $String -2 # delete the linebreak characters at the end
- # Download thesaurus dictionaries,
+ # 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
diff --git a/development/Win32/packaging/installer/include/init.nsh
b/development/Win32/packaging/installer/include/init.nsh
index db4a9ef..37d2b3e 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -168,19 +168,19 @@ SectionEnd
Section /o "English (AU)" SecDEnglishAU
StrCpy $DictCodes "en_AU,$DictCodes"
- AddSize 651
+ AddSize 552
SectionEnd
Section /o "English (CA)" SecDEnglishCA
StrCpy $DictCodes "en_CA,$DictCodes"
- AddSize 531
+ AddSize 550
SectionEnd
Section "English (GB)" SecDEnglishGB
# already installed by default
SectionIn RO
#StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 735
+ AddSize 742
SectionEnd
Section /o "English (NZ)" SecDEnglishNZ
@@ -192,7 +192,7 @@ Section "English (US)" SecDEnglishUS
# already installed by default
SectionIn RO
#StrCpy $DictCodes "en_US,$DictCodes"
- AddSize 547
+ AddSize 548
SectionEnd
Section "Espa�ol (ES)" SecDSpanishES
@@ -433,7 +433,7 @@ SectionEnd
Section /o "Ukrainian" SecDUkrainian
StrCpy $DictCodes "uk_UA,$DictCodes"
- AddSize 5298
+ AddSize 5555
SectionEnd
Section /o "Urdu" SecDUrdu
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 58de627..f72614c 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -14,11 +14,11 @@ These typically need to be modified for each LyX release
!define APP_VERSION_REVISION 2
!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 3 # Start with 1 for the installer releases of each
version
+!define APP_VERSION_BUILD 4 # 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
-!define COPYRIGHT_YEAR 2016
+!define COPYRIGHT_YEAR 2017
#--------------------------------
# Installer file name
@@ -51,12 +51,12 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
!define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "7.0.3"
+!define ImageMagickVersion "7.0.4"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef_windows_3_7.exe"
- !define SIZE_JABREF 36502 # size in KB
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6161.exe"
+ !define JabRefInstall "external\JabRef_windows_3_8_1.exe"
+ !define SIZE_JABREF 36566 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6219.exe"
!endif
