From: Uwe Stöhr <uwestoehr@web.de>
Date: Thu, 25 Sep 2008 21:15:38 +0000 (+0000)
Subject: installer: prepare for LyX 1.6.0rc3
X-Git-Tag: 1.6.10~3324
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ea7c8524f977726517c9af3b5c7a17abdd281945;p=features.git

installer: prepare for LyX 1.6.0rc3

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26553 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt
index 540c16db60..6a8dead4fd 100644
--- a/development/Win32/packaging/AltInstaller/ChangeLog.txt
+++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt
@@ -1,4 +1,14 @@
-Version 4.08
+Version 4.09
+- LyX 1.6rc3
+  (list of current regressions: http://tinyurl.com/yu4the )
+  (list of current crashes and critical bugs: http://tinyurl.com/653prg)
+- 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
+
+
+Version 4.08
 - LyX 1.6rc2
   (list of current regressions: http://tinyurl.com/yu4the )
   (list of current crashes and critical bugs: http://tinyurl.com/653prg)
diff --git a/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh b/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh
index f36766054c..066d29c13a 100644
--- a/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh
+++ b/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"
diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
index 7176d1073f..03d1d9dd2d 100644
--- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
+++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
@@ -127,16 +127,16 @@ Function MissingPrograms
 
   # test if the BibTeX-editor JabRef is installed
   StrCpy $BibTeXEditorPath ""
-  ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.1" "UninstallString"
-  ${if} $BibTeXEditorPath == ""
-   ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.2" "UninstallString"
-  ${endif}
+  ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.2" "UninstallString"
   ${if} $BibTeXEditorPath == ""
    ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.3" "UninstallString"
   ${endif}
   ${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"
diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh
index 29ce189909..1bef7879e5 100644
--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/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 "09"
 !define PRODUCT_DIR "D:\LyXPackage1.6"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.6.0rc2"
-!define PRODUCT_VERSION_SHORT "16rc2"
+!define PRODUCT_VERSION "1.6.0rc3"
+!define PRODUCT_VERSION_SHORT "16rc3"
 !define PRODUCT_SUBFOLDER "lyx16"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
 !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
@@ -18,7 +19,6 @@
 !define PRODUCT_ABOUT_URL "http://www.lyx.org/about/"
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
-!define INSTALLER_SUBVERSION "08"
 
 BrandingText "LyXWinInstaller v4.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}"
 
@@ -41,8 +41,8 @@ BrandingText "LyXWinInstaller v4.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}"
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
  !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn3"
- !define PRODUCT_VERSION_OLD "LyX 1.6.0rc1"
- !define PRODUCT_VERSION_SHORT_OLD "16rc1"
+ !define PRODUCT_VERSION_OLD "LyX 1.6.0rc2"
+ !define PRODUCT_VERSION_SHORT_OLD "16rc2"
  !define JabRefVersion "2.3.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
@@ -58,19 +58,19 @@ BrandingText "LyXWinInstaller v4.${INSTALLER_SUBVERSION} - ${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"