* All ImageMagick and Ghostscript resources are no longer installed as separate files...

[lyx.git] / development / Win32 / packaging / installer / include / declarations.nsh

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 0453778255e80ad7cc7b4e6bbd51aa1e03a60161..6e2662858ffab33ff929322e1b79836d9c008ef7 100644 (file)
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -38,7 +38,11 @@ SetCompressor /SOLID lzma
 !define FILES_LAUNCHER "..\..\launcher"
 !define FILES_PDFVIEW "..\..\pdfview"
 
-!define FILES_MSVC "$%SystemRoot%\WinSxS\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375"
+!if ${COMPILER_OS} == VISTA 
+  !define FILES_MSVC "$%SystemRoot%\WinSxS\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.21022.8_none_bcb86ed6ac711f91"
+!else
+  !define FILES_MSVC "$%SystemRoot%\WinSxS\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375"
+!endif
 !define FILES_PYTHON "${FILES_DEPS}\python"
 !define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
 !define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
@@ -49,7 +53,6 @@ SetCompressor /SOLID lzma
 !define FILES_DVIPOST_PKG "${FILES_DVIPOST}"
 !define FILES_PDFTOOLS "${FILES_DEPS}\pdftools"
 !define FILES_METAFILE2EPS "${FILES_DEPS}\metafile2eps"
-!define FILES_PSPRINTER "${FILES_DEPS}\metafile2eps\PSPrinter"
 
 !define FILES_QT "${FILES_DEPS}\qt-4"
 !define FILES_ASPELLDATA "${FILES_DEPS}\aspell"
@@ -59,17 +62,16 @@ SetCompressor /SOLID lzma
 #--------------------------------
 # Locations of components to download
 
-!define MIRROR_SF1 "http://superb-west.dl.sourceforge.net/sourceforge"
-!define MIRROR_SF2 "http://mesh.dl.sourceforge.net/sourceforge"
+# CTAN and SourceForge select a mirror automatically
+
+!define DOWNLOAD_LATEX "http://www.ctan.org/get/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
+!define DOWNLOADALT_LATEX "http://www.ctan.org/get/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
 
-!macro SourceForgeMirror ID FILENAME
-  !define DOWNLOAD_${ID} "${MIRROR_SF1}/${FILENAME}"
-  !define DOWNLOADALT_${ID} "${MIRROR_SF2}/${FILENAME}"
-!macroend
+!define DOWNLOAD_IMAGEMAGICK "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_IMAGEMAGICK}"
+!define DOWNLOADALT_IMAGEMAGICK "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_IMAGEMAGICK}"
 
-!insertmacro SourceForgeMirror LATEX "miktex/${SETUPFILE_LATEX}"
-!insertmacro SourceForgeMirror IMAGEMAGICK "imagemagick/${SETUPFILE_IMAGEMAGICK}"
-!insertmacro SourceForgeMirror GHOSTSCRIPT "ghostscript/${SETUPFILE_GHOSTSCRIPT}"
+!define DOWNLOAD_GHOSTSCRIPT "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_GHOSTSCRIPT}"
+!define DOWNLOADALT_GHOSTSCRIPT "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_GHOSTSCRIPT}"
 
 !define DOWNLOAD_ASPELLDICTS "ftp://ftp.lyx.org/pub/lyx/contrib/aspell6-windows"
 !define DOWNLOADALT_ASPELLDICTS "http://www.lyx.org/~bpeng/aspell6-windows"