set eol-style

[features.git] / development / Win32 / packaging / installer / settings.nsh

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 72e92e546eaa8d8a40acbbe1d1366f01cb801879..5e64f23ed9aceda16d284773ab6df1498c620899 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -1,59 +1,59 @@
-/*\r
-\r
-Settings for LyX installer\r
-\r
-These typically need to be modified for each LyX release\r
-\r
-*/\r
-\r
-#--------------------------------\r
-# Windows version on which the complier is running\r
-\r
-!define COMPILER_OS VISTA\r
-#!define COMPILER_OS XP\r
-\r
-#--------------------------------\r
-# Version number\r
-\r
-!define APP_VERSION_MAJOR 1\r
-!define APP_VERSION_MINOR 6\r
-!define APP_VERSION_REVISION 0\r
-!define APP_VERSION_BUILD 0 # Start with 1 for the installer releases of each version\r
-\r
-!define /date APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}svn %Y%m%d" # Version to display\r
-\r
-#--------------------------------\r
-# Installer file name\r
-\r
-# Typical names for the release are "LyX-1.5.4-1-Installer.exe" etc.\r
-\r
-!ifndef ExeFile\r
-  !define /date ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer.exe"\r
-!endif\r
-!ifndef BundleExeFile\r
-  !define /date BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Bundle.exe"\r
-!endif\r
-!ifndef MinimalExeFile\r
-  !define /date MinimalExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Minimal.exe"\r
-!endif\r
-\r
-#--------------------------------\r
-# File names of component installers\r
-\r
-!define SETUPFILE_LATEX "basic-miktex-2.7.3248.exe"\r
-!define SETUPFILE_IMAGEMAGEMAGICK "ImageMagick-6.4.1-0-Q16-windows-dll.exe"\r
-!define SETUPFILE_GHOSTSCRIPT "gs861w32.exe"\r
-\r
-#--------------------------------\r
-# Download size of components (in KB)\r
-\r
-!define SIZE_DOWNLOAD_LATEX 78493\r
-!define SIZE_DOWNLOAD_IMAGEMAGICK 8565\r
-!define SIZE_DOWNLOAD_GHOSTSCRIPT 12469\r
-\r
-#--------------------------------\r
-# Approximations of space required for components (in KB)\r
-\r
-!define SIZE_LATEX 225000\r
-!define SIZE_IMAGEMAGICK 34500\r
-!define SIZE_GHOSTSCRIPT 31500\r
+/*
+
+Settings for LyX installer
+
+These typically need to be modified for each LyX release
+
+*/
+
+#--------------------------------
+# Windows version on which the complier is running
+
+!define COMPILER_OS VISTA
+#!define COMPILER_OS XP
+
+#--------------------------------
+# Version number
+
+!define APP_VERSION_MAJOR 1
+!define APP_VERSION_MINOR 6
+!define APP_VERSION_REVISION 0
+!define APP_VERSION_BUILD 0 # 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
+
+#--------------------------------
+# Installer file name
+
+# Typical names for the release are "LyX-1.5.4-1-Installer.exe" etc.
+
+!ifndef ExeFile
+  !define /date ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer.exe"
+!endif
+!ifndef BundleExeFile
+  !define /date BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Bundle.exe"
+!endif
+!ifndef MinimalExeFile
+  !define /date MinimalExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Minimal.exe"
+!endif
+
+#--------------------------------
+# File names of component installers
+
+!define SETUPFILE_LATEX "basic-miktex-2.7.3248.exe"
+!define SETUPFILE_IMAGEMAGEMAGICK "ImageMagick-6.4.1-0-Q16-windows-dll.exe"
+!define SETUPFILE_GHOSTSCRIPT "gs861w32.exe"
+
+#--------------------------------
+# Download size of components (in KB)
+
+!define SIZE_DOWNLOAD_LATEX 78493
+!define SIZE_DOWNLOAD_IMAGEMAGICK 8565
+!define SIZE_DOWNLOAD_GHOSTSCRIPT 12469
+
+#--------------------------------
+# Approximations of space required for components (in KB)
+
+!define SIZE_LATEX 225000
+!define SIZE_IMAGEMAGICK 34500
+!define SIZE_GHOSTSCRIPT 31500