installer:

- preparation for LyX 1.5.5
 - backport the new PDF viewing method from trunk

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@24496 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2008-04-24 21:31:25 +00:00
parent 86824e189a
commit 3a3d8e2d98
4 changed files with 22 additions and 14 deletions

View File

@ -1,7 +1,12 @@
Version 3.24 Version 3.24
- LyX 1.5.5 - LyX 1.5.5
- updated to ImageMagick 6.4.?
- updated to Ghostscript 8.62 (fixes a bug of viewing PDF images within
LyX)
- new Japanese translation of the installer (thanks to Koji Yokata) - new Japanese translation of the installer (thanks to Koji Yokata)
- new method to view PDF files that should also work under Windows Vista
(thanks to Joost Verburg)
Version 3.23 Version 3.23

View File

@ -156,9 +156,9 @@ FunctionEnd
Function AcroPref Function AcroPref
# writes PDF settings to the preferences file # writes PDF settings to the preferences file
FileWrite $R4 '\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "PDFViewWin" "" "document,vector"$\r$\n\ FileWrite $R4 '\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector"$\r$\n\
\format "pdf2" "pdf" "PDF (pdflatex)" "F" "PDFViewWin" "" "document,vector"$\r$\n\ \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector"$\r$\n\
\format "pdf" "pdf" "PDF (ps2pdf)" "P" "PDFViewWin" "" "document,vector"$\r$\n' \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector"$\r$\n'
Push $0 Push $0
FunctionEnd FunctionEnd

View File

@ -3,8 +3,8 @@
!define PRODUCT_DIR "D:\LyXPackage1.5" !define PRODUCT_DIR "D:\LyXPackage1.5"
!define PRODUCT_NAME "LyX" !define PRODUCT_NAME "LyX"
!define PRODUCT_VERSION "1.5.4" !define PRODUCT_VERSION "1.5.5"
!define PRODUCT_VERSION_SHORT "154" !define PRODUCT_VERSION_SHORT "155"
!define PRODUCT_SUBFOLDER "lyx15" !define PRODUCT_SUBFOLDER "lyx15"
!define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt" !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
!define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX" !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
@ -19,12 +19,12 @@
!define PRODUCT_INFO_URL "http://www.lyx.org/" !define PRODUCT_INFO_URL "http://www.lyx.org/"
!define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe" !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
BrandingText "LyXWinInstaller v3.22 - ${INSTALLER_VERSION}" BrandingText "LyXWinInstaller v3.24 - ${INSTALLER_VERSION}"
# to check later if this installer version is running at the same time # to check later if this installer version is running at the same time
!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-22-AltInstaller-${INSTALLER_VERSION}.exe" !define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-24-AltInstaller-${INSTALLER_VERSION}.exe"
!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-22-AltInstaller-${INSTALLER2_VERSION}.exe" !define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-24-AltInstaller-${INSTALLER2_VERSION}.exe"
!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-22-AltInstaller-${INSTALLER3_VERSION}.exe" !define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-24-AltInstaller-${INSTALLER3_VERSION}.exe"
!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp" !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
# Replaced by HKLM or HKCU depending on SetShellVarContext. # Replaced by HKLM or HKCU depending on SetShellVarContext.
@ -38,9 +38,9 @@ BrandingText "LyXWinInstaller v3.22 - ${INSTALLER_VERSION}"
# definitions for the Update installer # definitions for the Update installer
!if ${INSTALLER_VERSION} == "Update" !if ${INSTALLER_VERSION} == "Update"
!define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX153" !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX154"
!define PRODUCT_VERSION_OLD "LyX 1.5.3" !define PRODUCT_VERSION_OLD "LyX 1.5.4"
!define PRODUCT_VERSION_SHORT_OLD "153" !define PRODUCT_VERSION_SHORT_OLD "154"
!define JabRefVersion "2.3.1" # could be an older version !define JabRefVersion "2.3.1" # could be an older version
!define ImageMagickVersion_Old "6.3.7" # could be an older version !define ImageMagickVersion_Old "6.3.7" # could be an older version
!define GhostscriptVersion_Old "8.61" # could be an older version !define GhostscriptVersion_Old "8.61" # could be an older version
@ -64,11 +64,11 @@ BrandingText "LyXWinInstaller v3.22 - ${INSTALLER_VERSION}"
!define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex" !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
!define ImageMagickVersion "6.3.8" !define ImageMagickVersion "6.4.0"
# for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin! # for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin!
!define ImageMagickDir "$INSTDIR\etc\ImageMagick" !define ImageMagickDir "$INSTDIR\etc\ImageMagick"
!define GhostscriptDir "$INSTDIR\etc\Ghostscript" !define GhostscriptDir "$INSTDIR\etc\Ghostscript"
!define GhostscriptVersion "8.61" !define GhostscriptVersion "8.62"
!define AiksaurusDir "$APPDATA\Aiksaurus" !define AiksaurusDir "$APPDATA\Aiksaurus"
!define AiksaurusInstall "external\Aiksaurus" !define AiksaurusInstall "external\Aiksaurus"
!define AspellDir "$APPDATA\Aspell" !define AspellDir "$APPDATA\Aspell"

View File

@ -2,7 +2,10 @@ Function UpdateModifiedFiles
# list with modified files for LyX 1.5.5 # list with modified files for LyX 1.5.5
SetOutPath "$INSTDIR\bin" # always here SetOutPath "$INSTDIR\bin" # always here
File "${PRODUCT_SOURCEDIR}\bin\Console.dll"
File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here
File "${PRODUCT_SOURCEDIR}\bin\pdfview.exe"
File "${PRODUCT_SOURCEDIR}\bin\System.dll"
File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here
File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here
SetOutPath "$INSTDIR\Resources" SetOutPath "$INSTDIR\Resources"