On Sun, Jul 24, 2011 at 11:09 PM, <uwesto...@lyx.org> wrote:
> Author: uwestoehr
> Date: Mon Jul 25 05:09:02 2011
> New Revision: 39372
> URL: http://www.lyx.org/trac/changeset/39372
>
> Log:
> 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
>
> Modified:
>
> lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
>
> lyx-devel/trunk/development/Win32/packaging/installer/include/variables.nsh
> lyx-devel/trunk/development/Win32/packaging/installer/settings.nsh
> lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh
> lyx-devel/trunk/development/Win32/packaging/installer/setup/install.nsh
>
> Modified:
> lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
>
> ==============================================================================
> ---
> lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
> Mon Jul 25 04:20:32 2011 (r39371)
> +++
> lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
> Mon Jul 25 05:09:02 2011 (r39372)
> @@ -97,6 +97,14 @@
> StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end
> 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 ""
>
> Modified:
> lyx-devel/trunk/development/Win32/packaging/installer/include/variables.nsh
>
> ==============================================================================
> ---
> lyx-devel/trunk/development/Win32/packaging/installer/include/variables.nsh
> Mon Jul 25 04:20:32 2011 (r39371)
> +++
> lyx-devel/trunk/development/Win32/packaging/installer/include/variables.nsh
> Mon Jul 25 05:09:02 2011 (r39372)
> @@ -13,6 +13,7 @@
> Var SetupLaTeX
> Var SizeLaTeX
>
> +Var Acrobat
> Var APPDATemp
> Var AppPre
> var AppSubfolder
>
> Modified:
> lyx-devel/trunk/development/Win32/packaging/installer/settings.nsh
>
> ==============================================================================
> --- lyx-devel/trunk/development/Win32/packaging/installer/settings.nsh Mon
> Jul 25 04:20:32 2011 (r39371)
> +++ lyx-devel/trunk/development/Win32/packaging/installer/settings.nsh Mon
> Jul 25 05:09:02 2011 (r39372)
> @@ -11,8 +11,8 @@
>
> !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 @@
>
> !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
>
> Modified:
> lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh
>
> ==============================================================================
> ---
> lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh
> Mon Jul 25 04:20:32 2011 (r39371)
> +++
> lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh
> Mon Jul 25 05:09:02 2011 (r39372)
> @@ -124,11 +124,17 @@
> 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"'
>
Dear Uwe,
Is it intentional to move the trailing " on a new line?
Also, could you add the line "Format 1" to the lyxrc.dist file?
Thanks,
Julien
${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\
>
> Modified:
> lyx-devel/trunk/development/Win32/packaging/installer/setup/install.nsh
>
> ==============================================================================
> --- lyx-devel/trunk/development/Win32/packaging/installer/setup/install.nsh
> Mon Jul 25 04:20:32 2011 (r39371)
> +++ lyx-devel/trunk/development/Win32/packaging/installer/setup/install.nsh
> Mon Jul 25 05:09:02 2011 (r39372)
> @@ -68,6 +68,20 @@
> 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"
>
