X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FWin32%2Fpackaging%2Finstaller%2Fsettings.nsh;h=8fbd9522e352ef8ec7c4d494612ff3b59c996590;hb=9c114d16e649559d5ed1d3f744df099a20d61986;hp=e0367e93157147a991cc8acc132e37c169819650;hpb=9473a7e6f8d72bea90ec704166547b4dc372fdfd;p=lyx.git

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index e0367e9315..8fbd9522e3 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -10,22 +10,24 @@ These typically need to be modified for each LyX release
 # Version number
 
 !define APP_VERSION_MAJOR 2
-!define APP_VERSION_MINOR 0
-!define APP_VERSION_REVISION 2
-!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version
+!define APP_VERSION_MINOR 1
+!define APP_VERSION_REVISION 4
+!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 4 # Start with 1 for the installer releases of each version
 
-!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display
+!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
 
 #--------------------------------
 # Installer file name
 
-# Typical names for the release are "LyX-201-1-Installer.exe" etc.
+# Typical names for the release are "LyX-201-Installer-1.exe" etc.
 
 !ifndef ExeFile
-  !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Installer.exe"
+  !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
 !endif
 !ifndef BundleExeFile
-  !define BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Bundle.exe"
+  !define BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Bundle-${APP_VERSION_BUILD}.exe"
 !endif
 !ifndef MinimalExeFile
   !define /date MinimalExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Minimal.exe"
@@ -35,10 +37,9 @@ These typically need to be modified for each LyX release
 # File locations
 # !!! you need to adjust them to the folders in your Windows system !!!
 
-!define FILES_LYX "C:\LyX\lyx-20-install"
-!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20"
-!define FILES_BUNDLE "C:\LyX\depsbundle"
-!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.7.3"
+!define FILES_LYX "D:\LyXPackage2.1\LyX"
+!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2010"
+!define FILES_QT "C:\Qt\4.8.7"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"
 
@@ -46,17 +47,18 @@ These typically need to be modified for each LyX release
 # MiKTeX
 # Sizes in KB
 
-!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
+# it seems that some companies block ftp access by default, therefore http access is preferred here
+!define MiKTeXRepo "http://ftp.fernuni-hagen.de/ftp-dir/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
+#!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
 
-!define JabRefVersion "2.7"
+!define JabRefVersion "2.10"
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.7.4"
+!define ImageMagickVersion "6.9.2"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef-2.7-setup.exe"
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4250.exe"
- !define SIZE_DOWNLOAD_LATEX 160106
- !define SIZE_LATEX 380000
+ !define JabRefInstall "external\JabRef-2.10-setup.exe"
+ !define SIZE_JABREF 14100
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5721.exe"
 !endif