installer: prepare for LyX 1.5.7

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@26552 a592a061-630c-0410-9148-cb99ea01b6c8

development/Win32/packaging/AltInstaller/ChangeLog.txt

@@ -1,6 +1,10 @@
 Version 3.26
 - LyX 1.5.7
 
+- updated to MiKTeX 2.7 (build 3164)
+- updated to Python 2.5.2
+- updated to Ghostscript 8.63
+- updated to ImageMagick 6.4.3-8
 - new Ukrainian translation of the installer (thanks to Yuri Chornoivan)
 - new Catalan translation of the installer (thanks to Joan Montané)
 

development/Win32/packaging/AltInstaller/Deleted.nsh

@@ -1,7 +1,7 @@
 Function DeleteFiles
 
- # list with deleted files for LyX 1.5.6
- Delete "$INSTDIR\Resources\examples\es\mathed.lyx"
+ # list with deleted files for LyX 1.5.7
+ #Delete "$INSTDIR\bin\python25.dll"
 
 FunctionEnd
 

development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh

@@ -6,7 +6,7 @@ Function Ghostscript
   ${if} $GhostscriptPath == ""
    # register Ghostscript
    WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_DLL" "${GhostscriptDir}\bin\gsdll32.dll"
-   WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_LIB" "${GhostscriptDir}\lib;${GhostscriptDir}\fonts;${GhostscriptDir}\Resource"
+   WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_LIB" "${GhostscriptDir}\lib"
    
    WriteRegStr HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to tell the uninstaller that it was installed with LyX
    StrCpy $GhostscriptPath "${GhostscriptDir}\bin"

development/Win32/packaging/AltInstaller/MissingPrograms.nsh

@@ -137,6 +137,9 @@ Function MissingPrograms
   ${if} $BibTeXEditorPath == ""
    ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.3.1" "UninstallString"
   ${endif}
+  ${if} $BibTeXEditorPath == ""
+   ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.4" "UninstallString"
+  ${endif}
   
   # test if Inkscape is installed
   ReadRegStr $SVGPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation"

development/Win32/packaging/AltInstaller/Settings.nsh

@@ -1,10 +1,11 @@
 # installer settings
 # You should need to change only these macros for new releases.
 
+!define INSTALLER_SUBVERSION "26"
 !define PRODUCT_DIR "D:\LyXPackage1.5"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5.6"
-!define PRODUCT_VERSION_SHORT "156"
+!define PRODUCT_VERSION "1.5.7"
+!define PRODUCT_VERSION_SHORT "157"
 !define PRODUCT_SUBFOLDER "lyx15"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
 !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
@@ -19,12 +20,12 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
 
-BrandingText "LyXWinInstaller v3.25 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v3.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}"
 
 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-25-AltInstaller-${INSTALLER_VERSION}.exe"
-!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-25-AltInstaller-${INSTALLER2_VERSION}.exe"
-!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-25-AltInstaller-${INSTALLER3_VERSION}.exe"
+!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER_VERSION}.exe"
+!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER2_VERSION}.exe"
+!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-3-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER3_VERSION}.exe"
 !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
 
 # Replaced by HKLM or HKCU depending on SetShellVarContext.
@@ -40,10 +41,10 @@ BrandingText "LyXWinInstaller v3.25 - ${INSTALLER_VERSION}"
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
  !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX155"
- !define PRODUCT_VERSION_OLD "LyX 1.5.5"
- !define PRODUCT_VERSION_SHORT_OLD "155"
+ !define PRODUCT_VERSION_OLD "LyX 1.5.6"
+ !define PRODUCT_VERSION_SHORT_OLD "156"
  !define JabRefVersion "2.3.1" # could be an older version
- !define ImageMagickVersion_Old "6.4.1" # could be an older version
+ !define ImageMagickVersion_Old "6.4.2" # could be an older version
  !define GhostscriptVersion_Old "8.62" # could be an older version
  !define MiKTeXDeliveredVersion "2.7" # could be an older version
 !endif
@@ -57,19 +58,19 @@ BrandingText "LyXWinInstaller v3.25 - ${INSTALLER_VERSION}"
 # definitions for the Complete installer
 !if ${INSTALLER_VERSION} == "Complete"
  !define GSviewInstall "external\gsv49w32.exe"
- !define JabRefInstall "external\JabRef-2.3.1-Setup.exe"
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3107.exe"
- !define JabRefVersion "2.3.1"
+ !define JabRefInstall "external\JabRef-2.4-Setup.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3164.exe"
+ !define JabRefVersion "2.4"
  !define MiKTeXDeliveredVersion "2.7"
 !endif
 
 !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
 
-!define ImageMagickVersion "6.4.2"
+!define ImageMagickVersion "6.4.3"
 # for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin!
 !define ImageMagickDir "$INSTDIR\etc\ImageMagick"
 !define GhostscriptDir "$INSTDIR\etc\Ghostscript"
-!define GhostscriptVersion "8.62"
+!define GhostscriptVersion "8.63"
 !define AiksaurusDir "$APPDATA\Aiksaurus"
 !define AiksaurusInstall "external\Aiksaurus"
 !define AspellDir "$APPDATA\Aspell"

development/Win32/packaging/AltInstaller/Updated.nsh

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