installer updates

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

diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt
index 76953c1f8c6bc1f4dda1b67179f8505e38e21765..80df9143e7f3a86378b662467781130fdbaf19a3 100644 (file)
--- a/development/Win32/packaging/AltInstaller/ChangeLog.txt
+++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt
@@ -1,10 +1,15 @@
-Version 4.03
+Version 4.04
+- LyX 1.6beta1
+  (list of current regressions: http://tinyurl.com/yu4the )
+
+
+Version 4.03
 - LyX 1.6alpha2
   (list of current regressions: http://tinyurl.com/yu4the )
 
 - added some missing Python files to be able to open old LyX documents with
   LyX 1.6svn
-- new method to view PDF files that should also work under Windows Vista
+- new method to view PDF files that also works under Windows Vista
   (thanks to Joost Verburg)
 - The .lyx file extension is no longer removed when it was not created by
   the LyX version that is uninstalled (necessary to be able to play with

diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh
index c38df17bf5896a1d41e6976161a9854955cf2537..9b0c1523964b39c5772e300055b78a2675fa3c99 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/development/Win32/packaging/AltInstaller/Settings.nsh
@@ -3,8 +3,8 @@
 
 !define PRODUCT_DIR "D:\LyXPackage1.6"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.6.0alpha2"
-!define PRODUCT_VERSION_SHORT "16svn3"
+!define PRODUCT_VERSION "1.6.0beta1"
+!define PRODUCT_VERSION_SHORT "16beta1"
 !define PRODUCT_SUBFOLDER "lyx16"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
 !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
@@ -19,12 +19,12 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
 
-BrandingText "LyXWinInstaller v4.03 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v4.04 - ${INSTALLER_VERSION}"
 
 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-03-AltInstaller-${INSTALLER_VERSION}.exe"
-!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-03-AltInstaller-${INSTALLER2_VERSION}.exe"
-!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-03-AltInstaller-${INSTALLER3_VERSION}.exe"
+!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-04-AltInstaller-${INSTALLER_VERSION}.exe"
+!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-04-AltInstaller-${INSTALLER2_VERSION}.exe"
+!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-04-AltInstaller-${INSTALLER3_VERSION}.exe"
 !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert16svn.bmp"
 
 # Replaced by HKLM or HKCU depending on SetShellVarContext.
@@ -39,9 +39,9 @@ BrandingText "LyXWinInstaller v4.03 - ${INSTALLER_VERSION}"
 
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
- !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn2"
- !define PRODUCT_VERSION_OLD "LyX 1.6svn-r24066"
- !define PRODUCT_VERSION_SHORT_OLD "16svn2"
+ !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn3"
+ !define PRODUCT_VERSION_OLD "LyX 1.6.0alpha2"
+ !define PRODUCT_VERSION_SHORT_OLD "16svn3"
  !define JabRefVersion "2.3.1" # could be an older version
  !define ImageMagickVersion_Old "6.4.0" # could be an older version
  !define GhostscriptVersion_Old "8.61" # could be an older version
@@ -58,18 +58,18 @@ BrandingText "LyXWinInstaller v4.03 - ${INSTALLER_VERSION}"
 !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.2960.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3053.exe"
  !define JabRefVersion "2.3.1"
  !define MiKTeXDeliveredVersion "2.7"
 !endif
 
 !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
 
-!define ImageMagickVersion "6.4.0"
+!define ImageMagickVersion "6.4.1"
 # 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.61"
+!define GhostscriptVersion "8.62"
 !define AiksaurusDir "$APPDATA\Aiksaurus"
 !define AiksaurusInstall "external\Aiksaurus"
 !define AspellDir "$APPDATA\Aspell"

diff --git a/development/Win32/packaging/AltInstaller/icons/lyx_logo_vert16beta1.bmp b/development/Win32/packaging/AltInstaller/icons/lyx_logo_vert16beta1.bmp
new file mode 100644 (file)
index 0000000..c29ba89
Binary files /dev/null and b/development/Win32/packaging/AltInstaller/icons/lyx_logo_vert16beta1.bmp differ