* allow Vista to display security prompt during printer installation

* setting for compilation on Vista
* select random SourceForge mirror

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25190 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 0453778255e80ad7cc7b4e6bbd51aa1e03a60161..08a5b670609986c828045bda6057bdb410e6b84d 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"
@@ -59,8 +63,8 @@ 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"
+!define MIRROR_SF1 "http://downloads.sourceforge.net" # A random mirror is selected
+!define MIRROR_SF2 "http://downloads.sourceforge.net"
 
 !macro SourceForgeMirror ID FILENAME
   !define DOWNLOAD_${ID} "${MIRROR_SF1}/${FILENAME}"

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 86adfb202380762fcd9538a4ed71c35bd0d8b529..f29a2b5b13e833f80c97cc2aed29c831b3b821cf 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -6,6 +6,12 @@ These typically need to be modified for each LyX release
 \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

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index e7cb47b2d74683f22ece368d3735f15aa9e9810a..e6a408a54bb0998bb3f4c6aec3f02e7ba0a810b4 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -164,7 +164,7 @@ Section -PSPrinter
     ExecWait '$PrinterConf /q /dd /m "Metafile to EPS Converter"'
 
     # Install printer and driver
-    ExecWait '$PrinterConf /q /if /f "$INSTDIR\PSPrinter\metafile2eps.inf" /r "FILE:" /m "Metafile to EPS Converter"'
+    ExecWait '$PrinterConf /if /f "$INSTDIR\PSPrinter\metafile2eps.inf" /r "FILE:" /m "Metafile to EPS Converter"'
 
     # Restore DEVMODE with proper settings
     ExecWait '$PrinterConf /q /Sr /n "Metafile to EPS Converter" /a "$INSTDIR\PSPrinter\metafile2eps.dat" g'