From d1567e8d9066d59d32f7bdd33698d607eb43ff40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Thu, 12 Jul 2007 00:21:53 +0000 Subject: [PATCH] installer: preparations for the LyX 1.5.0 release git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19050 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../Win32/packaging/AltInstaller/ChangeLog.txt | 7 +++++-- development/Win32/packaging/AltInstaller/LaTeX.nsh | 3 +++ .../Win32/packaging/AltInstaller/Settings.nsh | 12 ++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt index 5e1ddee689..ce8abec999 100644 --- a/development/Win32/packaging/AltInstaller/ChangeLog.txt +++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt @@ -1,7 +1,10 @@ -Version LyX 1.5xx-xx-07-2007 -- LyX 1.5xx-xx-07-2007 +Version 3.18 +- LyX 1.5.0 - support to set "Chinese" as LyX's menu language +- updated to MiKTeX 2.6 (version 2742) +- updated to ImageMagick 6.3.5 +- updated to GhostScript 8.57 Version LyX 1.5rc2-27-06-2007 diff --git a/development/Win32/packaging/AltInstaller/LaTeX.nsh b/development/Win32/packaging/AltInstaller/LaTeX.nsh index 6a0f95ba27..55da7c9638 100644 --- a/development/Win32/packaging/AltInstaller/LaTeX.nsh +++ b/development/Win32/packaging/AltInstaller/LaTeX.nsh @@ -255,7 +255,10 @@ Function UpdateMiKTeX MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater UpdateNow: StrCpy $0 $LaTeXPath -4 # remove "\bin" + # the update wizard is either started by the copystart.exe or the copystart_admin.exe + # the latter replaces copystart.exe since miktex-2.6.2742 ExecWait '"$LaTeXPath\copystart.exe" "$0\config\update.dat"' # run MiKTeX's update wizard + ExecWait '"$LaTeXPath\copystart_admin.exe" "$0\config\update.dat"' # run MiKTeX's update wizard UpdateLater: ${endif} diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh index 952884bfb8..83dc10955e 100644 --- a/development/Win32/packaging/AltInstaller/Settings.nsh +++ b/development/Win32/packaging/AltInstaller/Settings.nsh @@ -3,8 +3,8 @@ !define PRODUCT_DIR "D:\LyXPackage1.5" !define PRODUCT_NAME "LyX" -!define PRODUCT_VERSION "1.5xx-xx-07-2007" -!define PRODUCT_VERSION_SHORT "150svn" +!define PRODUCT_VERSION "1.5.0" +!define PRODUCT_VERSION_SHORT "150" !define PRODUCT_SUBFOLDER "lyx15" !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt" !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX" @@ -41,7 +41,7 @@ BrandingText "LyXWinInstaller v3.18 - ${INSTALLER_VERSION}" !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX150svn" !define PRODUCT_VERSION_OLD "LyX 1.5rc2-27-05-2007" !define PRODUCT_UNINSTALL_EXE_OLD "$INSTDIR\LyXWinUninstall.exe" - !define PRODUCT_VERSION_SHORT_OLD "150svn" + !define PRODUCT_VERSION_SHORT_OLD "150" !define JabRefVersion "2.2" # could be an older version !define MiKTeXDeliveredVersion "2.6" # could be an older version !endif @@ -56,18 +56,18 @@ BrandingText "LyXWinInstaller v3.18 - ${INSTALLER_VERSION}" !if ${INSTALLER_VERSION} == "Complete" !define GSviewInstall "external\gsv48w32.exe" !define JabRefInstall "external\JabRef-2.2-Setup.exe" - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.6.2726.exe" + !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.6.2742.exe" !define JabRefVersion "2.2" !define MiKTeXDeliveredVersion "2.6" !endif !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex" -!define ImageMagickVersion "6.3.4" +!define ImageMagickVersion "6.3.5" # 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.56" +!define GhostscriptVersion "8.57" !define AiksaurusDir "$APPDATA\Aiksaurus" !define AiksaurusInstall "external\Aiksaurus" !define AspellDir "$APPDATA\Aspell" -- 2.39.2