Win installer: new version with Qt 5.6.1

- the update to JabRef 3.4 which fixes installation problems if user has no admin privileges
- also update MiKTeX and ImageMagick

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index b50083229341256b8334521fb6935ae24ab35bc1..f512d25e2c7735b1858e3a2b87b77c4914947efa 100644 (file)
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,11 @@
-Changelog for LyX-220-2:
+Changelog for LyX-220-3:
+- updated to Qt 5.6.1
+- updated to MiKTeX 2.9 build 5997
+- updated to JabRef 3.4
+- updated to Imagemagick 6.9.4-8
+
+
+Changelog for LyX-220-2:
 - remove also the user dependent LyX settings from the registry if the user
   preferences should be uninstalled
 - calculate the required installation size correctly

diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh
index f04e594e480a165063731d40e776c15fe156f8eb..f1aba7cd8f0ff3b22af74006d5c2290105963f58 100644 (file)
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -156,23 +156,10 @@ Function MissingPrograms
    StrCpy $ImageEditor "Krita"
   ${endif}
 
-  # test if and where the BibTeX-editor JabRef 2.x is installed
-  ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
+  # test if and where the BibTeX-editor JabRef is installed
+  ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
   ${if} $PathBibTeXEditor == ""
-   ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
-  ${endif}
-  # since JabRef 3.x the pathes are different
-  # there is currently a bug in the Jabref installer that prevents to install it without admin permissions
-  # therefore only check the admin installation
-  ${if} $PathBibTeXEditor == ""
-   ReadRegStr $PathBibTeXEditor HKLM "SOFTWARE\Classes\JabRef\shell\open\command" ""
-   StrCpy $PathBibTeXEditor $PathBibTeXEditor -17 # remove '\JabRef.exe" "%1"'
-   StrCpy $PathBibTeXEditor $PathBibTeXEditor "" 1 # remove the leading quote
-  ${endif}
-  ${if} $PathBibTeXEditor == ""
-   # $Documents is the path to the documents folder of the current user (contains the user name)
-   StrCpy $PathBibTeXEditor $Documents -10 # remove '\Documents'
-   StrCpy $PathBibTeXEditor "$PathBibTeXEditor\JabRef"
+   ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
   ${endif}
 
   ${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 1af4a8e2feaea08d8d817a5fe5ebd58b369e0b3a..6553c336053df29d127d8a551420ad9253c89a07 100644 (file)
--- 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 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 2 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 3 # 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
 
@@ -40,8 +40,8 @@ These typically need to be modified for each LyX release
 # !!! you need to adjust them to the folders in your Windows system !!!
 
 !define FILES_LYX "D:\LyXPackage2.2\LyX"
-!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2010"
-!define FILES_QT "C:\Qt\Qt5.6.0-MSVC2015\5.6\msvc2015"
+!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
+!define FILES_QT "C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"
 
@@ -55,8 +55,8 @@ These typically need to be modified for each LyX release
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef_windows_3_3.exe"
- !define SIZE_JABREF 25730 # size in KB
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5987.exe"
+ !define JabRefInstall "external\JabRef_windows_3_4.exe"
+ !define SIZE_JABREF 25700 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5997.exe"
 !endif
 

diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 64289a82d0e8d9ad26901ac7b0d0a327fb41175e..65daf4f953a55982c578011fa61fc3ff10fbb33a 100644 (file)
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -145,13 +145,9 @@ Section -ProgramFiles SecProgramFiles
     StrCpy $PathBibTeXEditor ""
     ${if} $MultiUser.Privileges == "Admin"
      ${orif} $MultiUser.Privileges == "Power"
-     ReadRegStr $PathBibTeXEditor HKLM "SOFTWARE\Classes\JabRef\shell\open\command" ""
-     StrCpy $PathBibTeXEditor $PathBibTeXEditor -17 # remove '\JabRef.exe" "%1"'
-     StrCpy $PathBibTeXEditor $PathBibTeXEditor "" 1 # remove the leading quote
+     ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
     ${else}
-     # $Documents is the path to the documents folder of the current user (contains the user name)
-     StrCpy $PathBibTeXEditor $Documents -10 # remove '\Documents'
-     StrCpy $PathBibTeXEditor "$PathBibTeXEditor\JabRef"
+     ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
      ${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"
       StrCpy $PathBibTeXEditor ""
      ${endif}