anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-14 09:32:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* allow Vista to display security prompt during printer installation

Browse Source 
* setting for compilation on Vista
* select random SourceForge mirror

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@25191 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg 2008-06-07 17:30:38 +00:00
parent 69f0fe8470
commit 5766049dfe
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
development/Win32/packaging/installer/include/declarations.nsh
View File

@ -38,7 +38,11 @@ SetCompressor /SOLID lzma
!define FILES_LAUNCHER "..\..\launcher" !define FILES_LAUNCHER "..\..\launcher"
!define FILES_PDFVIEW "..\..\pdfview" !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_PYTHON "${FILES_DEPS}\python"
!define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick" !define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
!define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript" !define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
@ -59,8 +63,8 @@ SetCompressor /SOLID lzma
#-------------------------------- #--------------------------------
# Locations of components to download # Locations of components to download
!define MIRROR_SF1 "http://superb-west.dl.sourceforge.net/sourceforge" !define MIRROR_SF1 "http://downloads.sourceforge.net" # A random mirror is selected
!define MIRROR_SF2 "http://mesh.dl.sourceforge.net/sourceforge" !define MIRROR_SF2 "http://downloads.sourceforge.net"
!macro SourceForgeMirror ID FILENAME !macro SourceForgeMirror ID FILENAME
!define DOWNLOAD_${ID} "${MIRROR_SF1}/${FILENAME}" !define DOWNLOAD_${ID} "${MIRROR_SF1}/${FILENAME}"

6
development/Win32/packaging/installer/settings.nsh
View File

@ -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 # Version number

2
development/Win32/packaging/installer/setup/configure.nsh
View File

@ -164,7 +164,7 @@ Section -PSPrinter
ExecWait '$PrinterConf /q /dd /m "Metafile to EPS Converter"' ExecWait '$PrinterConf /q /dd /m "Metafile to EPS Converter"'
# Install printer and driver # 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 # Restore DEVMODE with proper settings
ExecWait '$PrinterConf /q /Sr /n "Metafile to EPS Converter" /a "$INSTDIR\PSPrinter\metafile2eps.dat" g' ExecWait '$PrinterConf /q /Sr /n "Metafile to EPS Converter" /a "$INSTDIR\PSPrinter\metafile2eps.dat" g'