From 8388adb89ace0f08fd015c4ff1a202544c5976d3 Mon Sep 17 00:00:00 2001 From: Joost Verburg Date: Sat, 7 Jun 2008 17:28:19 +0000 Subject: [PATCH] * 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 --- .../Win32/packaging/installer/include/declarations.nsh | 10 +++++++--- development/Win32/packaging/installer/settings.nsh | 6 ++++++ .../Win32/packaging/installer/setup/configure.nsh | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 0453778255..08a5b67060 100644 --- 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 86adfb2023..f29a2b5b13 100644 --- 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 */ +#-------------------------------- +# Windows version on which the complier is running + +!define COMPILER_OS VISTA +#!define COMPILER_OS XP + #-------------------------------- # Version number diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index e7cb47b2d7..e6a408a54b 100644 --- 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'