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

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index ec0d66efae..7a6eb13f38 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -1,113 +1,62 @@
-/*
-
-Settings for LyX installer
-
-*/
-
-#--------------------------------
-#File locations
-
-!define FILES_LICENSE "license.rtf"
-
-!define FILES_ICONS "..\icons"
-!define FILES_LAUNCHER "..\..\launcher"
-!define FILES_PDFVIEW "..\..\pdfview"
-
-!define FILES_MSVC "${FILES_WINDOWS}\WinSxS\x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.762_x-ww_6b128700"
-!define FILES_NETPBM "${FILES_DEPS}\netpbm"
-!define FILES_DTL "${FILES_DEPS}\dtl"
-!define FILES_AIKSAURUS "${FILES_DEPS}\aiksaurus\"
-!define FILES_DVIPOST "${FILES_DEPS}\dvipost"
-!define FILES_DVIPOST_PKG "${FILES_DVIPOST}"
-!define FILES_PDFTOOLS "${FILES_DEPS}\pdftools"
-
-!define FILES_QT "${FILES_DEPS}\qt-4"
-!define FILES_DVIPOSTDATA "${FILES_DEPS}\dvipost"
-!define FILES_ASPELLDATA "${FILES_DEPS}\aspell"
-
-!define FILES_NSISPLUGINS "${FILES_DEPS}\nsis"
-
-#--------------------------------
-#Locations of components to download
-!define DOWNLOAD_LATEX "http://superb-west.dl.sourceforge.net/sourceforge/miktex/basic-miktex-2.5.2580.exe"
-!define DOWNLOAD_IMAGEMAGICK "http://superb-west.dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-6.3.3-7-Q16-windows-dll.exe"
-!define DOWNLOAD_GHOSTSCRIPT "http://superb-west.dl.sourceforge.net/sourceforge/ghostscript/gs854w32-gpl.exe"
-!define DOWNLOAD_VIEWER "http://tug.ctan.org/tex-archive/nonfree/support/ghostscript/ghostgum/gsv48w32.exe"
-
-!define DOWNLOAD_ASPELLDICTS "ftp://ftp.lyx.org/pub/lyx/contrib/aspell6-windows"
-!define ALT_DOWNLOAD_ASPELLDICTS "http://www.lyx.org/~bpeng/aspell6-windows"
-
-#--------------------------------
-#Download size (in KB)
-
-!define SIZE_DOWNLOAD_LATEX 47271
-!define SIZE_DOWNLOAD_IMAGEMAGICK 6947
-!define SIZE_DOWNLOAD_GHOSTSCRIPT 12669
-!define SIZE_DOWNLOAD_VIEWER 1459
-
-#--------------------------------
-#Approximations of space required for components (in KB)
-
-!define SIZE_LATEX 120000
-!define SIZE_IMAGEMAGICK 17000
-!define SIZE_GHOSTSCRIPT 26000
-!define SIZE_VIEWER 4000
-
-#--------------------------------
-#Locations of setup files for components (for bundled setup)
-
-!define INSTALL_LATEX "basic-miktex-2.5.2580.exe"
-!define INSTALL_IMAGEMAGICK "ImageMagick-6.3.3-7-Q16-windows-dll.exe"
-!define INSTALL_GHOSTSCRIPT "gs854w32-gpl.exe"
-!define INSTALL_VIEWER "gsv48w32.exe"
-
-#--------------------------------
-#Names and version
-
-!define APP_NAME "LyX"
-!define /date APP_VERSION "1.5svn %Y%m%d"
-!define APP_VERSION_NUMBER "1.5.0.0"
-!define APP_SERIES_NAME "1.5"
-!define APP_SERIES_KEY "15"
-!define APP_DIR_USERDATA "LyX1.5.x"
-!define APP_INFO "${APP_NAME} - The Document Processor"
-!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2006 LyX Team"
-
-!define APP_RUN "bin\lyx.exe"
-
-!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}"
-!define APP_REGKEY_SETUP "Software\${APP_NAME}${APP_SERIES_KEY}\Setup"
-!define APP_REGKEY_SETTINGS "Software\${APP_NAME}${APP_SERIES_KEY}\Settings"
-
-!define APP_REGNAME_DOC "LyX.Document"
-
-!define APP_EXT ".lyx"
-!define APP_MIME_TYPE "application/lyx"
-
-#--------------------------------
-#Setup settings
-
-!ifndef SETUPTYPE_BUNDLE
-  !define /date SETUP_EXE "lyx-15svn-%Y%m%d.exe"
-!else
-  !define /date SETUP_EXE "lyx-15svn-%Y%m%d-bundle.exe"
-!endif
-
-!define SETUP_DEFAULT_DIRECTORY "$PROGRAMFILES\${APP_NAME}${APP_SERIES_KEY}"
-!define SETUP_ICON "${FILES_ICONS}\lyx_32x32.ico"
-!define SETUP_HEADERIMAGE "graphics\header.bmp"
-!define SETUP_WIZARDIMAGE "graphics\wizard.bmp"
-!define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"
-!define SETUP_UNINSTALLER_KEY "${APP_NAME}"
-
-#--------------------------------
-#Names of binaries to identify compontents
-
-!define BIN_LATEX "tex.exe"
-!define BIN_IMAGEMAGICK "convert.exe"
-!define BIN_GHOSTSCRIPT "gswin32c.exe"
-
-#--------------------------------
-#Custom NSIS plug-ins
-
-!addplugindir "${FILES_NSISPLUGINS}"
+/*
+
+Settings for LyX installer
+
+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 3
+!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}" # Version to display
+
+#--------------------------------
+# Installer file name
+
+# Typical names for the release are "LyX-201-1-Installer.exe" etc.
+
+!ifndef ExeFile
+  !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Installer.exe"
+!endif
+!ifndef BundleExeFile
+  !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 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
+