commit 4961683764c7228b06db5e9f09872eb5cffa7f65
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sun Oct 16 14:34:27 2016 +0200

    Win installer backport recent changes
---
 .../Win32/packaging/installer/ChangeLog.txt        |   16 +++++-
 development/Win32/packaging/installer/Packages.txt |   10 +++-
 .../Win32/packaging/installer/babel-Packages.txt   |   52 ++++++++++++++++++++
 .../Win32/packaging/installer/include/LaTeX.nsh    |   12 +---
 .../Win32/packaging/installer/include/init.nsh     |   26 +++++++---
 development/Win32/packaging/installer/settings.nsh |    4 +-
 development/cmake/build5-2015.bat                  |    2 +-
 7 files changed, 99 insertions(+), 23 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index 90fd3c9..68b8138 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,9 +1,21 @@
-Changelog for LyX-222-1:
+Changelog for LyX-222-2:
+- updated to Qt 5.6.2-1 (fixes Windows-specific bugs)
+- updated to Perl 5.22.2.1
+
+
+Changelog for LyX-222-1:
 - installs LyX 2.2.2
 - updated to MiKTeX 2.9 build 6069
-- updated to Imagemagick 7.0.3-0
+- updated to Imagemagick 7.0.3-3
 - updated to JabRef 3.6
 - updated to NSIS 3.0
+- updated to Ghostscript 9.20
+- new thesaurus for English (AU)
+- updated thesaurus for Portuguese and Ukrainian
+- updated spell checker dictionaries for English (CA, GB and US), Portuguese
+  and Ukrainian
+  (To benefit from them you must uninstall an already installed LyX 2.2.x and
+   then use this installer.)
 
 
 Changelog for LyX-221-2:
diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 581b911..a3c8db7 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -12,6 +12,8 @@ authordate
 babel-albanian
 babel-bahasa
 babel-basque
+babel-belarusian
+babel-bosnian
 babel-breton
 babel-bulgarian
 babel-catalan
@@ -21,8 +23,9 @@ babel-danish
 babel-dutch
 babel-esperanto
 babel-estonian
-babel-finnish  
-babel-galician         
+babel-finnish
+babel-friulan
+babel-galician
 babel-georgian
 babel-greek
 babel-hebrew
@@ -34,10 +37,13 @@ babel-italian
 babel-kurmanji
 babel-latin
 babel-latvian
+babel-macedonian
 babel-norsk
+babel-piedmontese
 babel-polish
 babel-portuges
 babel-romanian
+babel-romansh
 babel-russian
 babel-samin
 babel-scottish
diff --git a/development/Win32/packaging/installer/babel-Packages.txt 
b/development/Win32/packaging/installer/babel-Packages.txt
new file mode 100644
index 0000000..4f780fa
--- /dev/null
+++ b/development/Win32/packaging/installer/babel-Packages.txt
@@ -0,0 +1,52 @@
+babel-albanian
+babel-bahasa
+babel-basque
+babel-belarusian
+babel-bosnian
+babel-breton
+babel-bulgarian
+babel-catalan
+babel-croatian
+babel-czech
+babel-danish
+babel-dutch
+babel-english
+babel-esperanto
+babel-estonian
+babel-finnish
+babel-french
+babel-friulan
+babel-galician
+babel-german
+babel-greek
+babel-hebrew
+babel-hungarian
+babel-icelandic
+babel-interlingua
+babel-irish
+babel-italian
+babel-kurmanji
+babel-latin
+babel-latvian
+babel-macedonian
+babel-norsk
+babel-piedmontese
+babel-polish
+babel-portuges
+babel-romanian
+babel-romansh
+babel-russian
+babel-samin
+babel-scottish
+babel-serbian  
+babel-serbianc
+babel-slovak
+babel-slovenian
+babel-sorbian
+babel-spanish
+babel-swedish
+babel-thai
+babel-turkish
+babel-ukrainian
+babel-vietnamese
+babel-welsh
\ No newline at end of file
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh 
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 045b271..dcf7cd0 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -214,7 +214,6 @@ FunctionEnd
   ${if} $PathLaTeX == ""
    # launch MiKTeX's installer
    MessageBox MB_OK|MB_ICONINFORMATION "$(LatexInfo)" /SD IDOK
-   MessageBox MB_OK|MB_ICONINFORMATION "${MiKTeXInstall} --shared"
    ${if} $MultiUser.Privileges != "Admin"
    ${andif} $MultiUser.Privileges != "Power"
     # call the non-admin version
@@ -278,16 +277,11 @@ Function ConfigureMiKTeX
    SetOutPath "$PathLaTeXLocal\tex\latex\lyx"
    CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" 
"$PathLaTeXLocal\tex\latex\lyx"
   ${endif}
-  # Belarusian support
-  ${ifnot} ${FileExists} "$PathLaTeXLocal\tex\generic\babel\belarusian.ldf"
-   SetOutPath "$PathLaTeXLocal\tex\generic\babel"
-   File "${FILES_DVIPOST_PKG}\belarusian.ldf"
-   File "${FILES_DVIPOST_PKG}\belarusian.sty"
-  ${endif}
   # Hungarian support
+  # The following seems to be unnecesary since 2015, therefore it is commented
   # this is a replacement therefore do this in every case
-  SetOutPath "$PathLaTeXLocal\tex\generic\babel"
-  File "${FILES_DVIPOST_PKG}\magyar.ldf"
+  #SetOutPath "$PathLaTeXLocal\tex\generic\babel"
+  #File "${FILES_DVIPOST_PKG}\magyar.ldf"
   
   # install a Perl interpreter for splitindex and pdfcrop
   SetOutPath "$INSTDIR"
diff --git a/development/Win32/packaging/installer/include/init.nsh 
b/development/Win32/packaging/installer/include/init.nsh
index 6447734..53f8b21 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -348,7 +348,7 @@ SectionEnd
 
 Section /o "Portugu�s (PT)" SecDPortuguesePT
  StrCpy $DictCodes "pt_PT,$DictCodes"
- AddSize 1490
+ AddSize 1568
 SectionEnd
 
 Section /o "Rom�na" SecDRomanian
@@ -428,7 +428,7 @@ SectionEnd
 
 Section /o "Ukrainian" SecDUkrainian
  StrCpy $DictCodes "uk_UA,$DictCodes"
- AddSize 3077
+ AddSize 5298
 SectionEnd
 
 Section /o "Urdu" SecDUrdu
@@ -476,12 +476,17 @@ Section /o "Deutsch (CH)" SecTGermanCH
  AddSize 14600
 SectionEnd
 
+Section /o "English (AU)" SecTEnglishAU
+ StrCpy $ThesCodes "en_AU,$ThesCodes"
+ AddSize 21642
+SectionEnd
+
 Section /o "English (GB)" SecTEnglishGB
  StrCpy $ThesCodes "en_GB,$ThesCodes"
  AddSize 14300
 SectionEnd
 
-Section /o "English (US/AU)" SecTEnglishUSAU
+Section /o "English (US)" SecTEnglishUS
  StrCpy $ThesCodes "en_US,$ThesCodes"
  AddSize 22095
 SectionEnd
@@ -543,7 +548,7 @@ SectionEnd
 
 Section /o "Portugu�s" SecTPortuguese
  StrCpy $ThesCodes "pt_PT,$ThesCodes"
- AddSize 860
+ AddSize 3950
 SectionEnd
 
 Section /o "Rom�na" SecTRomanian
@@ -573,7 +578,7 @@ SectionEnd
 
 Section /o "Ukrainian" SecTUkrainian
  StrCpy $ThesCodes "uk_UA,$ThesCodes"
- AddSize 1309
+ AddSize 1339
 SectionEnd
 
 SectionGroupEnd
@@ -1262,6 +1267,13 @@ Function .onInit
    SectionSetFlags ${SecTGermanCH} $0
    SectionSetSize ${SecTGermanCH} 0
   ${endif}
+  StrCpy $Search "en_AU"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecTEnglishAU} $0
+   SectionSetSize ${SecTEnglishAU} 0
+  ${endif}
   StrCpy $Search "en_GB"
   Call StrPoint
   ${if} $Pointer != "-1"
@@ -1273,8 +1285,8 @@ Function .onInit
   Call StrPoint
   ${if} $Pointer != "-1"
    IntOp $0 ${SF_SELECTED} | ${SF_RO}
-   SectionSetFlags ${SecTEnglishUSAU} $0
-   SectionSetSize ${SecTEnglishUSAU} 0
+   SectionSetFlags ${SecTEnglishUS} $0
+   SectionSetSize ${SecTEnglishUS} 0
   ${endif}
   StrCpy $Search "es_ES"
   Call StrPoint
diff --git a/development/Win32/packaging/installer/settings.nsh 
b/development/Win32/packaging/installer/settings.nsh
index 758fc6c..1b2930b 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -14,7 +14,7 @@ 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 1 # Start with 1 for the installer releases of each 
version
+!define APP_VERSION_BUILD 2 # 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
 
@@ -41,7 +41,7 @@ These typically need to be modified for each LyX release
 
 !define FILES_LYX "D:\LyXPackage2.2\LyX"
 !define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
-!define FILES_QT "C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015"
+!define FILES_QT "C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"
 
diff --git a/development/cmake/build5-2015.bat 
b/development/cmake/build5-2015.bat
index 7ebabf9..6f87067 100644
--- a/development/cmake/build5-2015.bat
+++ b/development/cmake/build5-2015.bat
@@ -33,7 +33,7 @@ REM Save path
 set CALLED_FROM=%CD%
 
 REM Add path to qmake here or set PATH correctly on your system.
-set PATH=C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015\bin;%PATH%
+set PATH=C:\Qt\Qt5.6.2-MSVC2015\5.6\msvc2015\bin;%PATH%
 
 REM Edit pathes here or set the environment variables on your system.
 set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015

Reply via email to