X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FWin32%2Fpackaging%2Finstaller%2Fsettings.nsh;h=7a6eb13f38ddb0cfe3c73d517a0392afd1e6d865;hb=07d3b5bc237b39ba72a94819cdb1451ad8f98289;hp=bea49e2b903a20bc176ef201ff14a6a8b5f0dae3;hpb=e2329914ec6c41148df222d7ef73c459f2dbda8e;p=lyx.git

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index bea49e2b90..7a6eb13f38 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -6,36 +6,57 @@ 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 0
-!define APP_VERSION_BUILD 0 # Start with 1 for the installer releases of each version
+!define APP_VERSION_REVISION 3
+!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version
 
-!define /date APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}svn %Y%m%d" # Version to display
+!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display
 
 #--------------------------------
 # Installer file name
 
-# Typical names for the release are "LyX-2.0.0-1-Installer.exe" etc.
+# Typical names for the release are "LyX-201-1-Installer.exe" etc.
 
 !ifndef ExeFile
-  !define /date ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer.exe"
+  !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Installer.exe"
 !endif
 !ifndef BundleExeFile
-  !define /date BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Bundle.exe"
+  !define BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Bundle.exe"
 !endif
 !ifndef MinimalExeFile
   !define /date MinimalExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Minimal.exe"
 !endif
 
+#--------------------------------
+# 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 ClassFileDir "${FILES_LYX}\Resources\tex"
+!define DVIPostFileDir "${FILES_DEPS}\tex"
+
 #--------------------------------
 # MiKTeX
 # Sizes in KB
 
-!define SETUPFILE_LATEX "basic-miktex-2.9.3972.exe"
-!define SIZE_DOWNLOAD_LATEX 141645
-!define SIZE_LATEX 380000
+!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
+
+!define JabRefVersion "2.8"
+!define MiKTeXDeliveredVersion "2.9"
+!define ImageMagickVersion "6.7.6"
+ 
+# definitions for the Complete installer
+!if ${SETUPTYPE} == BUNDLE
+ !define JabRefInstall "external\JabRef-2.7-setup.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4407.exe"
+ !define SIZE_DOWNLOAD_LATEX 162476
+ !define SIZE_LATEX 380000
+!endif
+