installer:

- accept compound words is Aspell-only and thus not needed
- we use pdfview to show PDF files but this is only necessary if Acrobat or Adobe Reader is used
- update to latest MiKTeX version
- ImageMagick requires registry settings

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39372 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-07-25 03:09:02 +00:00
parent daec2e8afe
commit 780bb6a26d
5 changed files with 38 additions and 7 deletions

View File

@ -98,6 +98,14 @@ Function MissingPrograms
StrCpy $DelPythonFiles "True"
${endif}
# test if Acrobat or Adobe Reader is used as PDF-viewer
ReadRegStr $String HKCR ".pdf" ""
${if} $String != "AcroExch.Document" # this name is only used by Acrobat and Adobe Reader
StrCpy $Acrobat "None"
${else}
StrCpy $Acrobat "Yes"
${endif}
# test if a PostScript-viewer is installed, only check for GSview32
StrCpy $PSVPath ""
ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path"

View File

@ -13,6 +13,7 @@ Var PathBibTeXEditor
Var SetupLaTeX
Var SizeLaTeX
Var Acrobat
Var APPDATemp
Var AppPre
var AppSubfolder

View File

@ -11,8 +11,8 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 0
!define APP_VERSION_REVISION 0
!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each version
!define APP_VERSION_REVISION 1
!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version
!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display
@ -48,12 +48,14 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
!define JabRefVersion "2.6"
!define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "6.7.0"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
!define JabRefInstall "external\JabRef-2.6-setup.exe"
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4106.exe"
!define JabRefVersion "2.6"
!define MiKTeXDeliveredVersion "2.9"
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4146.exe"
!define SIZE_DOWNLOAD_LATEX 160106
!define SIZE_LATEX 380000
!endif

View File

@ -124,11 +124,17 @@ Section -Configure
Delete "$INSTDIR\Resources\lyxrc.dist"
FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" w
# set some general things
FileWrite $R1 '\screen_zoom "120"$\r$\n\
\accept_compound true$\r$\n'
FileWrite $R1 '\screen_zoom "120$\r$\n"'
${if} "$PathPrefix" != ""
FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
${endif}
${if} $Acrobat == "Yes" # use pdfview for Acrobat / Adobe Reader
FileWrite $R1 '\format "pdf5" "pdf" "PDF (LuaTeX)" "u" "pdfview" "" "document,vector,menu=export"$\r$\n\
\format "pdf4" "pdf" "PDF (XeTeX)" "X" "pdfview" "" "document,vector,menu=export"$\r$\n\
\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector,menu=export"$\r$\n\
\format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector,menu=export"$\r$\n\
\format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector,menu=export"$\r$\n'
${endif}
# if a SVG to PDF converter ws found (e.g. Inkscape)
${if} $SVGPath != ""
FileWrite $R1 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\

View File

@ -68,6 +68,20 @@ Section -ProgramFiles SecProgramFiles
SetOutPath "$INSTDIR\imagemagick"
File /r "${FILES_IMAGEMAGICK}\"
!insertmacro FileListMSVC File "${FILES_MSVC}\"
# register ImageMagick
WriteRegStr SHCTX "SOFTWARE\Classes\Applications" "AutoRun" "$INSTDIR\imagemagick\convert.exe $$"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "BinPath" "$INSTDIR\imagemagick"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "CoderModulesPath" "$INSTDIR\imagemagick\modules\coders"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "ConfigurePath" "$INSTDIR\imagemagick\config"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "FilterModulesPath" "$INSTDIR\imagemagick\modules\filters"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "LibPath" "$INSTDIR\imagemagick"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "BinPath" "$INSTDIR\imagemagick"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "CoderModulesPath" "$INSTDIR\imagemagick\modules\coders"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "ConfigurePath" "$INSTDIR\imagemagick\config"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "FilterModulesPath" "$INSTDIR\imagemagick\modules\filters"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "LibPath" "$INSTDIR\imagemagick"
WriteRegDWORD SHCTX "SOFTWARE\ImageMagick\Current" "QuantumDepth" 0x00000010
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "Version" "${ImageMagickVersion}"
# Components of Ghostscript
SetOutPath "$INSTDIR\ghostscript"