mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-21 23:09:40 +00:00
backported features from 1.5 installer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@18931 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
2c22bab7ba
commit
5542bb2238
@ -21,10 +21,18 @@ ${StrStr}
|
||||
|
||||
!include "..\packaging\installer\settings.nsh" ;Version info from installer
|
||||
|
||||
;--------------------------------
|
||||
;Settings
|
||||
|
||||
Caption "${APP_NAME} ${APP_VERSION}"
|
||||
OutFile lyx.exe
|
||||
BrandingText " "
|
||||
|
||||
;--------------------------------
|
||||
;Windows Vista settings
|
||||
|
||||
RequestExecutionLevel user
|
||||
|
||||
;--------------------------------
|
||||
;Variables
|
||||
|
||||
|
@ -77,7 +77,6 @@ Section -Core SecCore
|
||||
|
||||
SetOutPath "$INSTDIR\python"
|
||||
!insertmacro FileListPythonBin File "${FILES_PYTHON}\"
|
||||
SetOutPath "$INSTDIR\python"
|
||||
!insertmacro FileListPythonDll File "$%SystemRoot%\System32\"
|
||||
SetOutPath "$INSTDIR\python\Lib"
|
||||
!insertmacro FileListPythonLib File "${FILES_PYTHON}\Lib\"
|
||||
|
@ -125,6 +125,7 @@ Lists of files to include in the installer
|
||||
!macro FileListPythonDll COMMAND DIRECTORY
|
||||
|
||||
${FILE}python25.dll"
|
||||
${FILE}msvcr71.dll"
|
||||
|
||||
!macroend
|
||||
|
||||
|
@ -48,7 +48,7 @@ Settings for LyX installer
|
||||
!define DOWNLOADALT_${ID} "${MIRROR_SF2}/${FILENAME}"
|
||||
!macroend
|
||||
|
||||
!insertmacro SourceForgeMirror LATEX "miktex/basic-miktex-2.6.2704.exe"
|
||||
!insertmacro SourceForgeMirror LATEX "miktex/basic-miktex-2.6.2726.exe"
|
||||
!insertmacro SourceForgeMirror IMAGEMAGICK "imagemagick/ImageMagick-6.3.4-10-Q16-windows-dll.exe"
|
||||
!insertmacro SourceForgeMirror GHOSTSCRIPT "ghostscript/gs857w32.exe"
|
||||
|
||||
@ -61,7 +61,7 @@ Settings for LyX installer
|
||||
;--------------------------------
|
||||
;Download size (in KB)
|
||||
|
||||
!define SIZE_DOWNLOAD_LATEX 53759
|
||||
!define SIZE_DOWNLOAD_LATEX 53512
|
||||
!define SIZE_DOWNLOAD_IMAGEMAGICK 7111
|
||||
!define SIZE_DOWNLOAD_GHOSTSCRIPT 11916
|
||||
!define SIZE_DOWNLOAD_VIEWER 1459
|
||||
@ -77,8 +77,8 @@ Settings for LyX installer
|
||||
;--------------------------------
|
||||
;Locations of setup files for components (for bundled setup)
|
||||
|
||||
!define INSTALL_LATEX "basic-miktex-2.6.2704.exe"
|
||||
!define INSTALL_IMAGEMAGICK "ImageMagick-6.3.4-8-Q16-windows-dll.exe"
|
||||
!define INSTALL_LATEX "basic-miktex-2.6.2726.exe"
|
||||
!define INSTALL_IMAGEMAGICK "ImageMagick-6.3.4-10-Q16-windows-dll.exe"
|
||||
!define INSTALL_GHOSTSCRIPT "gs857w32.exe"
|
||||
!define INSTALL_VIEWER "gsv48w32.exe"
|
||||
|
||||
|
@ -26,6 +26,11 @@ OutFile pdfview.exe
|
||||
Icon "..\packaging\icons\lyx_32x32.ico"
|
||||
SilentInstall silent
|
||||
|
||||
;--------------------------------
|
||||
;Windows Vista settings
|
||||
|
||||
RequestExecutionLevel user
|
||||
|
||||
;--------------------------------
|
||||
;Constants
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user