mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
installer: sync with branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27874 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr
parent
26fd757eab
commit
8795db1740
@ -219,7 +219,7 @@ Function InstallAspellDictionary
|
||||
|
||||
# show message about Aspell dictionaries
|
||||
# the code rule to display the correct message:
|
||||
# - when the englisch dictionary is already installed or couldn't be installed -> set a "1"
|
||||
# - when the English dictionary is already installed or couldn't be installed -> set a "1"
|
||||
# - when the dictionary of the chosen LyX menu language is already installed or couldn't be installed -> set a "2"
|
||||
# - when the dictionary of the Windows system language is already installed or couldn't be installed -> set a "3"
|
||||
# - when the dictionary of the chosen LyX menu language is equal to the dictionary of the Windows system language -> set a "4"
|
||||
@ -256,11 +256,14 @@ Function InstallAspellDictionary
|
||||
ExecShell "open" "${AspellLocationExact}"
|
||||
DownloadLater:
|
||||
|
||||
# finally copy the Aspell dictionary files to the Application folder of all users
|
||||
# this assures that every user can have its own word list
|
||||
StrCpy $AppSubfolder "Aspell"
|
||||
StrCpy $AppFiles "$APPDATA\Aspell\Dictionaries"
|
||||
Call CreateAppPathSub # function from LyXUtils.nsh
|
||||
# when something was installed, copy the Aspell dictionary files to the Application
|
||||
# folder of all users this assures that every user can have its own word list
|
||||
${if} $AspellInstallYes != "321"
|
||||
${andif} $AspellInstallYes != "421"
|
||||
StrCpy $AppSubfolder "Aspell"
|
||||
StrCpy $AppFiles "$APPDATA\Aspell\Dictionaries"
|
||||
Call CreateAppPathSub # function from LyXUtils.nsh
|
||||
${endif}
|
||||
|
||||
FunctionEnd
|
||||
|
||||
|
||||
@ -1,99 +1,2 @@
|
||||
Version 4.14
|
||||
- fix a bug in the Romanian translation of the installer
|
||||
- fix installation of Aspell dictionaries in Win Vista
|
||||
- fix uninstalling of the file extensions ".lyx13" and the like
|
||||
|
||||
|
||||
Version 4.13
|
||||
- LyX 1.6.0
|
||||
|
||||
|
||||
Version 4.12
|
||||
- add missing Python files after the update to Python 2.6
|
||||
|
||||
|
||||
Version 4.11
|
||||
- LyX 1.6rc5
|
||||
(list of current regressions: http://tinyurl.com/yu4the )
|
||||
(list of current crashes and critical bugs: http://tinyurl.com/653prg)
|
||||
- fix bug that the installer ignored for some cases when LyX should only
|
||||
installed for the current user
|
||||
- updated to Python 2.6
|
||||
|
||||
|
||||
Version 4.10
|
||||
- LyX 1.6rc4
|
||||
(list of current regressions: http://tinyurl.com/yu4the )
|
||||
(list of current crashes and critical bugs: http://tinyurl.com/653prg)
|
||||
- LyX files with the extensions ".lyx15" etc. that you get when exporting
|
||||
to older LyX versions, can now be opened by double clicking on them
|
||||
|
||||
|
||||
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.4-1
|
||||
|
||||
|
||||
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)
|
||||
- new Catalan translation of the installer (thanks to Joan Montané)
|
||||
|
||||
|
||||
Version 4.07
|
||||
- LyX 1.6rc1
|
||||
(list of current regressions: http://tinyurl.com/yu4the )
|
||||
(list of current crashes and critical bugs: http://tinyurl.com/653prg)
|
||||
- Ukrainian translation of the installer (thanks to Yuri Chornoivan)
|
||||
- Arabic translation of the installer (thanks to Hatim Alahmadi)
|
||||
|
||||
|
||||
Version 4.06
|
||||
- LyX 1.6beta4
|
||||
(list of current regressions: http://tinyurl.com/yu4the )
|
||||
(list of current crashes and critical bugs: http://tinyurl.com/653prg)
|
||||
|
||||
|
||||
Version 4.05
|
||||
- LyX 1.6beta3
|
||||
(list of current regressions: http://tinyurl.com/yu4the )
|
||||
|
||||
- When Aspell is installed together with this installer (this will be the
|
||||
case when Aspell is not already installed), now every user on the PC
|
||||
gets his personal word list files.
|
||||
|
||||
|
||||
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 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
|
||||
LyX 1.6svn without touching existing LyX installations)
|
||||
|
||||
|
||||
Version 4.02
|
||||
- LyX 1.6svn-r24066
|
||||
(list of current regressions: http://tinyurl.com/yu4the )
|
||||
|
||||
- Japanese translation of the installer (thanks to Koji Yokata)
|
||||
- added a DLL that is needed on some Windows systems to be able to start LyX
|
||||
|
||||
|
||||
Version 4.01
|
||||
- LyX 1.6svn-1
|
||||
Version 5.01
|
||||
- LyX 2.0svn-1
|
||||
|
||||
@ -55,7 +55,6 @@ Var MiKTeXVersion
|
||||
Var MiKTeXUser
|
||||
Var MiKTeXPath
|
||||
Var MissedProg
|
||||
Var PrinterConf
|
||||
Var PSVPath
|
||||
Var SVGPath
|
||||
Var WMFPath
|
||||
|
||||
@ -36,8 +36,6 @@ CRCCheck force
|
||||
# variables only used in this installer version
|
||||
|
||||
Var AppFiles
|
||||
|
||||
Var GhostscriptPath
|
||||
Var AiksaurusPath
|
||||
Var AspellPath
|
||||
Var Acrobat
|
||||
@ -46,6 +44,7 @@ Var DelGSDir
|
||||
Var DelPythonFiles
|
||||
Var DelWMFDir
|
||||
Var EditorPath
|
||||
Var GhostscriptPath
|
||||
Var ImageEditorPath
|
||||
Var LangEncoding
|
||||
Var LangSysEncoding
|
||||
@ -53,7 +52,6 @@ Var LaTeXName
|
||||
Var MiKTeXVersion
|
||||
Var MiKTeXUser
|
||||
Var MissedProg
|
||||
Var PrinterConf
|
||||
Var PSVPath
|
||||
Var State
|
||||
Var SVGPath
|
||||
|
||||
@ -48,6 +48,7 @@ Var AppPath
|
||||
!include "FileFunc.nsh"
|
||||
!include "StrFunc.nsh"
|
||||
!include "TextFunc.nsh"
|
||||
!include "WinVer.nsh"
|
||||
!insertmacro LineFind
|
||||
!include "WordFunc.nsh"
|
||||
!insertmacro WordReplace
|
||||
@ -177,6 +178,13 @@ Function .onInit
|
||||
Abort
|
||||
${endif}
|
||||
|
||||
# printer settings, needed to install the Metafile2eps printer
|
||||
${if} ${AtLeastWinVista}
|
||||
StrCpy $PrinterConf "printui.exe"
|
||||
${else}
|
||||
StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry"
|
||||
${endif}
|
||||
|
||||
# check where LyX is installed
|
||||
ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY_OLD}" "DisplayIcon"
|
||||
${if} $0 != ""
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
# installer settings
|
||||
# You should need to change only these macros for new releases.
|
||||
|
||||
!define INSTALLER_SUBVERSION "13"
|
||||
!define INSTALLER_SUBVERSION "16"
|
||||
!define PRODUCT_DIR "D:\LyXPackage1.6"
|
||||
!define PRODUCT_NAME "LyX"
|
||||
!define PRODUCT_VERSION "1.6.0"
|
||||
!define PRODUCT_VERSION_SHORT "160"
|
||||
!define PRODUCT_VERSION "1.6.1"
|
||||
!define PRODUCT_VERSION_SHORT "161"
|
||||
!define PRODUCT_SUBFOLDER "lyx16"
|
||||
!define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
|
||||
!define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
|
||||
@ -59,14 +59,14 @@ BrandingText "LyXWinInstaller v4.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}"
|
||||
!if ${INSTALLER_VERSION} == "Complete"
|
||||
!define GSviewInstall "external\gsv49w32.exe"
|
||||
!define JabRefInstall "external\JabRef-2.4.2-Setup.exe"
|
||||
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3224.exe"
|
||||
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3248.exe"
|
||||
!define JabRefVersion "2.4.2"
|
||||
!define MiKTeXDeliveredVersion "2.7"
|
||||
!endif
|
||||
|
||||
!define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
|
||||
|
||||
!define ImageMagickVersion "6.4.5"
|
||||
!define ImageMagickVersion "6.4.7"
|
||||
# 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"
|
||||
|
||||
@ -36,7 +36,11 @@ Function un.onInit
|
||||
${endif}
|
||||
|
||||
# printer settings, needed to uninstall the Metafile2eps printer
|
||||
!insertmacro PrinterInit
|
||||
${if} ${AtLeastWinVista}
|
||||
StrCpy $PrinterConf "printui.exe"
|
||||
${else}
|
||||
StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry"
|
||||
${endif}
|
||||
|
||||
# Macro to investigate name of LyX's preferences folders to be able remove them
|
||||
!insertmacro UnAppPreSuff $AppPre $AppSuff # macro from LyXUtils.nsh
|
||||
|
||||
@ -1,29 +1,30 @@
|
||||
# Variables used by all installer versions
|
||||
Var AspellInstallYes
|
||||
Var AspellBaseReg
|
||||
Var AspellMessage
|
||||
Var ImageMagickPath
|
||||
Var JabRefInstalled
|
||||
Var LatexPath
|
||||
Var MiKTeXInstalled
|
||||
Var PythonPath
|
||||
Var Answer
|
||||
Var AppPre
|
||||
Var AppSubfolder
|
||||
Var AppSuff
|
||||
Var AspellBaseReg
|
||||
Var AspellInstallYes
|
||||
Var AspellMessage
|
||||
Var CreateDesktopIcon
|
||||
Var CreateFileAssociations
|
||||
Var DictCode
|
||||
Var FileName
|
||||
Var ImageMagickPath
|
||||
Var JabRefInstalled
|
||||
Var LangCode
|
||||
Var LangCodeSys
|
||||
Var LangName
|
||||
Var LangNameSys
|
||||
Var LatexPath
|
||||
Var MiKTeXInstalled
|
||||
Var NewString
|
||||
Var OldString
|
||||
Var PathPrefix
|
||||
Var Pointer
|
||||
Var PrinterConf
|
||||
Var ProductRootKey
|
||||
Var PythonPath
|
||||
Var RunNumber
|
||||
Var StartmenuFolder
|
||||
Var String
|
||||
|
||||
Loading…
Reference in New Issue
Block a user