mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
Copy over Windows installer updates from stable.
This commit is contained in:
parent
cbc4e2399a
commit
1f325e69bd
@ -1,4 +1,4 @@
|
||||
Changelog for LyX-230-5:
|
||||
Changelog for LyX-230:
|
||||
- installs LyX 2.3.0
|
||||
- fix installation of Arabic spell checker
|
||||
- updated to MiKTeX 2.9 build 6615
|
||||
|
BIN
development/Win32/packaging/installer/icons/lyx.ico
Normal file
BIN
development/Win32/packaging/installer/icons/lyx.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 37 KiB |
@ -8,10 +8,6 @@ Handling of LaTeX distributions
|
||||
#
|
||||
# - LaTeXActions (checks if MiKTeX or TeXLive is installed)
|
||||
#
|
||||
# - InstallMiKTeX (installs MiKTeX if not already installed),
|
||||
# only for bunlde installer, uses:
|
||||
# LaTeXCheck # function from LyXUtils.nsh
|
||||
#
|
||||
# - ConfigureMiKTeX
|
||||
# (installs the LaTeX class files that are delivered with LyX,
|
||||
# a Perl interpreter for splitindex and pdfcrop
|
||||
@ -19,8 +15,6 @@ Handling of LaTeX distributions
|
||||
#
|
||||
# - ConfigureTeXLive
|
||||
# (installs the LaTeX class files that are delivered with LyX)
|
||||
#
|
||||
# - UpdateMiKTeX (asks to update MiKTeX)
|
||||
|
||||
# ---------------------------------------
|
||||
|
||||
@ -204,50 +198,6 @@ Function LaTeXActions
|
||||
|
||||
FunctionEnd
|
||||
|
||||
# -------------------------------------------
|
||||
|
||||
!if ${SETUPTYPE} == BUNDLE
|
||||
|
||||
Function InstallMiKTeX
|
||||
# installs MiKTeX if not already installed
|
||||
|
||||
${if} $PathLaTeX == ""
|
||||
# launch MiKTeX's installer
|
||||
MessageBox MB_OK|MB_ICONINFORMATION "$(LatexInfo)" /SD IDOK
|
||||
${if} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
# call the non-admin version
|
||||
ExecWait ${MiKTeXInstall}
|
||||
${else}
|
||||
ExecWait "${MiKTeXInstall} --shared"
|
||||
${endif}
|
||||
# test if MiKTeX is installed
|
||||
Call LaTeXActions
|
||||
${if} ${RunningX64}
|
||||
SetRegView 32 # we install the 32bit version of MiKTeX
|
||||
${endif}
|
||||
${if} $PathLaTeX != ""
|
||||
# special entry that it was installed together with LyX
|
||||
# so that we can later uninstall it together with LyX
|
||||
${if} $MiKTeXUser == "HKCU"
|
||||
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
|
||||
${else}
|
||||
WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
|
||||
${endif}
|
||||
StrCpy $LaTeXInstalled "MiKTeX"
|
||||
StrCpy $MiKTeXVersion ${MiKTeXDeliveredVersion}
|
||||
${else}
|
||||
MessageBox MB_OK|MB_ICONSTOP "$(LatexError1)" /SD IDOK
|
||||
SetOutPath $TEMP # to be able to delete the $INSTDIR
|
||||
RMDir /r $INSTDIR
|
||||
Abort
|
||||
${endif} # endif $PathLaTeX != ""
|
||||
${endif}
|
||||
|
||||
FunctionEnd
|
||||
|
||||
!endif # endif ${SETUPTYPE} == BUNDLE
|
||||
|
||||
# ------------------------------
|
||||
|
||||
Function ConfigureMiKTeX
|
||||
@ -276,83 +226,28 @@ Function ConfigureMiKTeX
|
||||
# files in Resources\tex
|
||||
SetOutPath "$PathLaTeXLocal\tex\latex\lyx"
|
||||
CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" "$PathLaTeXLocal\tex\latex\lyx"
|
||||
|
||||
# refresh MiKTeX's file name database (do this always to assure everything is in place)
|
||||
${if} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
# call the non-admin version
|
||||
nsExec::ExecToLog "$PathLaTeX\initexmf --update-fndb"
|
||||
${else}
|
||||
${if} $MiKTeXUser != "HKCU" # call the admin version
|
||||
nsExec::ExecToLog "$PathLaTeX\initexmf --admin --update-fndb"
|
||||
${else}
|
||||
nsExec::ExecToLog "$PathLaTeX\initexmf --update-fndb"
|
||||
${endif}
|
||||
${endif}
|
||||
Pop $UpdateFNDBReturn # Return value
|
||||
${endif}
|
||||
|
||||
# install a Perl interpreter for splitindex and pdfcrop
|
||||
SetOutPath "$INSTDIR"
|
||||
# recursively copy all files under Perl
|
||||
File /r "${FILES_PERL}"
|
||||
|
||||
# refresh MiKTeX's file name database (do this always to assure everything is in place)
|
||||
${if} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
# call the non-admin version
|
||||
nsExec::ExecToLog "$PathLaTeX\initexmf --update-fndb"
|
||||
${else}
|
||||
${if} $MiKTeXUser != "HKCU" # call the admin version
|
||||
nsExec::ExecToLog "$PathLaTeX\initexmf --admin --update-fndb"
|
||||
${else}
|
||||
nsExec::ExecToLog "$PathLaTeX\initexmf --update-fndb"
|
||||
${endif}
|
||||
${endif}
|
||||
Pop $UpdateFNDBReturn # Return value
|
||||
|
||||
${endif} # end if $PathLaTeX != ""
|
||||
|
||||
# enable package installation without asking (1 = Yes, 0 = No, 2 = Ask me first) and
|
||||
# if there is not package repository (MiKTeX's primary package repository) then set it
|
||||
${if} ${RunningX64}
|
||||
${andif} $Is64bit == "true"
|
||||
SetRegView 64
|
||||
${else}
|
||||
SetRegView 32
|
||||
${endif}
|
||||
${if} $MiKTeXUser == "HKCU" # if only for current user
|
||||
# if AutoInstall is set to "0" we can assume that this was set purposly since the default is "1"
|
||||
ReadRegStr $2 HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall"
|
||||
${if} $2 == "0"
|
||||
Goto NoAutoInstall
|
||||
${endif}
|
||||
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
|
||||
ReadRegStr $1 HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository"
|
||||
${if} $1 == ""
|
||||
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}"
|
||||
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote"
|
||||
${endif}
|
||||
${else}
|
||||
# if AutoInstall is set to "0" we can assume that this was set purposly since the default is "1"
|
||||
ReadRegStr $2 HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall"
|
||||
${if} $2 == "0"
|
||||
Goto NoAutoInstall
|
||||
${endif}
|
||||
WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
|
||||
ReadRegStr $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository"
|
||||
${if} $1 == ""
|
||||
WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}"
|
||||
WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote"
|
||||
${endif}
|
||||
# we need to state that missing packages should be installed for all users too
|
||||
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoAdmin" "t"
|
||||
${endif}
|
||||
NoAutoInstall:
|
||||
|
||||
# update MiKTeX's package file list
|
||||
${if} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
# call the non-admin version
|
||||
nsExec::ExecToLog "$PathLaTeX\mpm.exe --update-fndb"
|
||||
${else}
|
||||
${if} $MiKTeXUser != "HKCU" # call the admin version
|
||||
nsExec::ExecToLog "$PathLaTeX\mpm.exe --admin --update-fndb"
|
||||
${else}
|
||||
nsExec::ExecToLog "$PathLaTeX\mpm.exe --update-fndb"
|
||||
${endif}
|
||||
${endif}
|
||||
Pop $UpdateFNDBReturn # Return value
|
||||
|
||||
# we must return to 32bit because LyX is a 32bit application
|
||||
SetRegView 32
|
||||
|
||||
|
||||
${endif} # end if $PathLaTeX != ""
|
||||
FunctionEnd
|
||||
|
||||
# ------------------------------
|
||||
@ -372,105 +267,9 @@ Function ConfigureTeXLive
|
||||
# files in Resources\tex
|
||||
SetOutPath "$PathLaTeXLocal\texmf-dist\tex\latex\lyx"
|
||||
CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" "$PathLaTeXLocal\texmf-dist\tex\latex\lyx"
|
||||
# update TeXLive's package file list
|
||||
ExecWait '$PathLaTeX\texhash'
|
||||
${endif}
|
||||
${endif}
|
||||
|
||||
# update TeXLive's package file list
|
||||
ExecWait '$PathLaTeX\texhash'
|
||||
|
||||
# update TeXLive
|
||||
ExecWait '$PathLaTeX\tlmgr update --all'
|
||||
|
||||
FunctionEnd
|
||||
|
||||
# ------------------------------
|
||||
|
||||
Function UpdateMiKTeX
|
||||
# asks to update MiKTeX
|
||||
|
||||
# only for the 2.3.0 installer: force a silent update of MiKTeX then restore
|
||||
# MiKTeX's inernal links
|
||||
# The reason is that MikTeX uses a new package handling system LyX must use
|
||||
# Due to a bug in the old MikTeX package handling the update to the new package
|
||||
# handling might fail and users cannot use LaTeX at all afterwards - they then
|
||||
# would have no other choice than to reinstall MiKTeX
|
||||
# This case is fixed by forcing the restoration of the internal links
|
||||
# There is another issue: the MiKTeX update program needs to be replaced by
|
||||
# the new MiKTeX console. This is a 3-step process.
|
||||
#MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" #/SD IDNO IDYES UpdateNow IDNO UpdateLater
|
||||
#UpdateNow:
|
||||
# graphical update:
|
||||
#MessageBox MB_OK|MB_ICONINFORMATION 'To assure that LyX can create PDF files the MiKTeX update program must be run two times.$\r$\n\
|
||||
# Please click in the MiKTeX update program only on the "Next" button.$\r$\n\
|
||||
# If "Next" is disabled, click on "Cancel" or "Finish".'
|
||||
#${if} $MultiUser.Privileges != "Admin"
|
||||
#${andif} $MultiUser.Privileges != "Power"
|
||||
# # call the non-admin version
|
||||
# nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update.exe"'
|
||||
#${else}
|
||||
# ${if} $MiKTeXUser != "HKCU" # call the admin version
|
||||
# nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update_admin.exe"'
|
||||
# ${else}
|
||||
# nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update.exe"'
|
||||
# ${endif}
|
||||
#${endif}
|
||||
# silent update:
|
||||
MessageBox MB_OK|MB_ICONINFORMATION "MiKTeX must be updated to assure that LyX can create PDF files.$\r$\n\
|
||||
This update can take several minutes, depending on your Internet speed.$\r$\n\
|
||||
Please do not close the LyX installer until it is finished!" /SD IDOK
|
||||
${if} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
# call the non-admin version
|
||||
# the order of the different commands is important!
|
||||
${if} $Is64bit == "true"
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-x64-2.9"'
|
||||
${else}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-2.9"'
|
||||
${endif}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
|
||||
${else}
|
||||
${if} $MiKTeXUser != "HKCU" # call the admin version
|
||||
# the order of the different commands is important!
|
||||
${if} $Is64bit == "true"
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update=miktex-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--install=miktex-console-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--uninstall=miktex-mpm-bin-x64-2.9"'
|
||||
${else}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update=miktex-bin-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--install=miktex-console-bin-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--uninstall=miktex-mpm-bin-2.9"'
|
||||
${endif}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update"'
|
||||
${else}
|
||||
${if} $Is64bit == "true"
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-x64-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-x64-2.9"'
|
||||
${else}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-2.9"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-2.9"'
|
||||
${endif}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
|
||||
${endif}
|
||||
${endif}
|
||||
# restore possibly broken internal MiKTeX links after the update
|
||||
# suggested by the MikTeX maintainer: https://github.com/MiKTeX/miktex/issues/82
|
||||
${if} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
# call the non-admin version
|
||||
nsExec::ExecToLog '"$PathLaTeX\initexmf.exe" "--mklinks" "--force"'
|
||||
${else}
|
||||
${if} $MiKTeXUser != "HKCU" # call the admin version
|
||||
nsExec::ExecToLog '"$PathLaTeX\initexmf.exe" "--admin" "--mklinks" "--force"'
|
||||
${else}
|
||||
nsExec::ExecToLog '"$PathLaTeX\initexmf.exe" "--mklinks" "--force"'
|
||||
${endif}
|
||||
${endif}
|
||||
#UpdateLater:
|
||||
|
||||
FunctionEnd
|
||||
|
@ -9,13 +9,12 @@ Configuration of LyX installer
|
||||
#--------------------------------
|
||||
# File locations
|
||||
|
||||
!define FILES_LICENSE "license.rtf"
|
||||
!define FILES_ICONS "icons"
|
||||
!define FILES_LICENSE "${FILES_GIT}\license.rtf"
|
||||
!define FILES_ICONS "${FILES_GIT}\icons"
|
||||
!define FILES_PDFVIEW "${FILES_DEPS}\bin"
|
||||
!define FILES_MSVC "${FILES_DEPS}\bin"
|
||||
!define FILES_PERL "${FILES_DEPS}\Perl"
|
||||
!define FILES_PYTHON "${FILES_DEPS}\Python"
|
||||
!define FILES_ELYXER "${FILES_DEPS}\bin"
|
||||
!define FILES_UNOCONV "${FILES_DEPS}\bin"
|
||||
!define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
|
||||
!define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
|
||||
@ -34,11 +33,6 @@ Configuration of LyX installer
|
||||
|
||||
!define DOWNLOAD_LATEX "http://mirrors.ctan.org/systems/win32/miktex/setup/${SETUPFILE_LATEX}"
|
||||
|
||||
#--------------------------------
|
||||
# Locations of setup files for components (for bundled setup)
|
||||
|
||||
!define INSTALL_LATEX "${SETUPFILE_LATEX}"
|
||||
|
||||
#--------------------------------
|
||||
# Names and version
|
||||
|
||||
@ -58,14 +52,13 @@ Configuration of LyX installer
|
||||
!define APP_WIKI "https://wiki.lyx.org"
|
||||
!define APP_WIKI_INFO "${APP_NAME} Wiki"
|
||||
!define APP_COPYRIGHT "${APP_NAME} is Copyright © 1995 by Matthias Ettrich, 1995-${COPYRIGHT_YEAR} by the ${APP_NAME} Team"
|
||||
|
||||
!if ${SETUPTYPE} == STANDARD
|
||||
!define APP_SETUPTYPE "Standard"
|
||||
!else if ${SETUPTYPE} == BUNDLE
|
||||
!define APP_SETUPTYPE "Bundle"
|
||||
!endif
|
||||
|
||||
!define APP_RUN "bin\lyx.exe"
|
||||
!define BIN_LYX "lyx.exe"
|
||||
!define BIN_LYX "LyX.exe"
|
||||
!define APP_RUN "bin\${BIN_LYX}"
|
||||
|
||||
!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220"
|
||||
!define APP_REGKEY_SETUP "${APP_REGKEY}\Setup"
|
||||
@ -86,9 +79,6 @@ Configuration of LyX installer
|
||||
|
||||
!if ${SETUPTYPE} == STANDARD
|
||||
!define SETUP_EXE ${ExeFile}
|
||||
!else if ${SETUPTYPE} == BUNDLE
|
||||
!define SETUP_EXE ${BundleExeFile}
|
||||
!define BUNDLESETUP_LATEX
|
||||
!endif
|
||||
|
||||
!define SETUP_ICON "${FILES_ICONS}\lyx.ico"
|
||||
|
@ -73,25 +73,13 @@ Function DownloadHunspellDictionaries
|
||||
|
||||
${if} $DictCode == $R3
|
||||
StrCpy $String $String -2 # delete the linebreak characters at the end
|
||||
# Download hunspell dictionaries,
|
||||
# if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
|
||||
FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
|
||||
|
||||
${For} $4 1 22 # there are 22 mirrors in the file
|
||||
FileRead $R4 $Search # $Search is now the mirror
|
||||
StrCpy $Search $Search -2 # delete the linebreak characters at the end
|
||||
Push $R0
|
||||
inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
|
||||
Pop $R0
|
||||
${if} $R0 == "OK"
|
||||
${ExitFor}
|
||||
${endif}
|
||||
${Next}
|
||||
|
||||
FileClose $R4
|
||||
# Download hunspell dictionaries
|
||||
Push $R0
|
||||
inetc::get /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
|
||||
Pop $R0
|
||||
# if download failed
|
||||
${if} $R0 != "OK"
|
||||
MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)"
|
||||
MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed): $R0"
|
||||
Goto abortinstall
|
||||
${endif}
|
||||
${endif} # end if $DictCode == $R3
|
||||
@ -99,8 +87,8 @@ Function DownloadHunspellDictionaries
|
||||
${Next}
|
||||
FileClose $R5
|
||||
|
||||
abortinstall:
|
||||
Delete "$INSTDIR\$String"
|
||||
abortinstall:
|
||||
Delete "$INSTDIR\$String"
|
||||
|
||||
FunctionEnd
|
||||
|
||||
@ -119,25 +107,13 @@ Function DownloadThesaurusDictionaries
|
||||
|
||||
${if} $ThesCode == $R3
|
||||
StrCpy $String $String -2 # delete the linebreak characters at the end
|
||||
# Download thesaurus files,
|
||||
# if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
|
||||
FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
|
||||
|
||||
${For} $4 1 22 # there are 22 mirrors in the file
|
||||
FileRead $R4 $Search # $Search is now the mirror
|
||||
StrCpy $Search $Search -2 # delete the linebreak characters at the end
|
||||
Push $R0
|
||||
inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
|
||||
Pop $R0
|
||||
${if} $R0 == "OK"
|
||||
${ExitFor}
|
||||
${endif}
|
||||
${Next}
|
||||
|
||||
FileClose $R4
|
||||
# Download thesaurus files
|
||||
Push $R0
|
||||
inetc::get /POPUP /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
|
||||
Pop $R0
|
||||
# if download failed
|
||||
${if} $R0 != "OK"
|
||||
MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed)"
|
||||
MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed): $R0"
|
||||
Goto abortinstall
|
||||
${endif}
|
||||
${endif} # end if $ThesCode == $R3
|
||||
@ -145,8 +121,8 @@ Function DownloadThesaurusDictionaries
|
||||
${Next}
|
||||
FileClose $R5
|
||||
|
||||
abortinstall:
|
||||
Delete "$INSTDIR\$String"
|
||||
abortinstall:
|
||||
Delete "$INSTDIR\$String"
|
||||
|
||||
FunctionEnd
|
||||
|
||||
|
@ -10,15 +10,19 @@ Lists of files to include in the installer
|
||||
|
||||
!macro FileListLyXBin COMMAND DIRECTORY
|
||||
|
||||
${FILE}lyx.exe"
|
||||
${FILE}${BIN_LYX}"
|
||||
${FILE}tex2lyx.exe"
|
||||
|
||||
!macroend
|
||||
|
||||
!macro FileListQtBin COMMAND DIRECTORY
|
||||
|
||||
${FILE}Qt5Concurrent.dll"
|
||||
${FILE}Qt5Core.dll"
|
||||
${FILE}Qt5Gui.dll"
|
||||
${FILE}Qt5Network.dll"
|
||||
${FILE}Qt5OpenGL.dll"
|
||||
${FILE}Qt5PrintSupport.dll"
|
||||
${FILE}Qt5Svg.dll"
|
||||
${FILE}Qt5Widgets.dll"
|
||||
${FILE}Qt5WinExtras.dll"
|
||||
@ -28,11 +32,10 @@ Lists of files to include in the installer
|
||||
!macro FileListQtImageformats COMMAND DIRECTORY
|
||||
|
||||
${FILE}qgif.dll"
|
||||
${FILE}qicns.dll"
|
||||
${FILE}qico.dll"
|
||||
${FILE}qjpeg.dll"
|
||||
${FILE}qsvg.dll"
|
||||
${FILE}qtga.dll"
|
||||
${FILE}qicns.dll"
|
||||
${FILE}qtiff.dll"
|
||||
${FILE}qwbmp.dll"
|
||||
${FILE}qwebp.dll"
|
||||
@ -52,16 +55,46 @@ Lists of files to include in the installer
|
||||
|
||||
!macroend
|
||||
|
||||
!macro FileListQtStyles COMMAND DIRECTORY
|
||||
|
||||
${FILE}qwindowsvistastyle.dll"
|
||||
|
||||
!macroend
|
||||
|
||||
!macro FileListMinGW COMMAND DIRECTORY
|
||||
|
||||
# Files needed for MinGW
|
||||
${FILE}iconv.dll"
|
||||
${FILE}libbz2-1.dll"
|
||||
${FILE}libfreetype-6.dll"
|
||||
${FILE}libgcc_s_sjlj-1.dll"
|
||||
${FILE}libglib-2.0-0.dll"
|
||||
${FILE}libharfbuzz-0.dll"
|
||||
${FILE}libintl-8.dll"
|
||||
${FILE}libjpeg-62.dll"
|
||||
${FILE}libpcre-1.dll"
|
||||
${FILE}libpcre2-16-0.dll"
|
||||
${FILE}libpng16-16.dll"
|
||||
${FILE}libstdc++-6.dll"
|
||||
${FILE}libtiff-5.dll"
|
||||
${FILE}libwinpthread-1.dll"
|
||||
${FILE}libwebp-7.dll"
|
||||
${FILE}libwebpdemux-2.dll"
|
||||
${FILE}zlib1.dll"
|
||||
|
||||
!macroend
|
||||
|
||||
!macro FileListMSVC COMMAND DIRECTORY
|
||||
|
||||
# Files needed for MSVC 2015
|
||||
# Seem to be installed for dependencies
|
||||
${FILE}concrt140.dll"
|
||||
${FILE}msvcp140.dll"
|
||||
${FILE}vcamp140.dll"
|
||||
${FILE}vccorlib140.dll"
|
||||
${FILE}vcomp140.dll"
|
||||
${FILE}vcruntime140.dll"
|
||||
|
||||
|
||||
!macroend
|
||||
|
||||
!macro FileListNetpbmBin COMMAND DIRECTORY
|
||||
@ -96,16 +129,6 @@ Lists of files to include in the installer
|
||||
|
||||
!macroend
|
||||
|
||||
!macro FileListeLyXer COMMAND DIRECTORY
|
||||
|
||||
${FILE}elyxer.py"
|
||||
${FILE}lyx.css"
|
||||
${FILE}math.css"
|
||||
${FILE}math2html.py"
|
||||
${FILE}toc.css"
|
||||
|
||||
!macroend
|
||||
|
||||
!macro FileListPDFViewBin COMMAND DIRECTORY
|
||||
|
||||
${FILE}pdfview.exe"
|
||||
|
@ -32,8 +32,10 @@ BrandingText " "
|
||||
# Welcome page
|
||||
!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME)
|
||||
!insertmacro MUI_PAGE_WELCOME
|
||||
|
||||
# Show the license.
|
||||
!insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"
|
||||
|
||||
# Decision if it should be installed as admin or not
|
||||
!insertmacro MULTIUSER_PAGE_INSTALLMODE
|
||||
|
||||
@ -50,10 +52,8 @@ BrandingText " "
|
||||
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${APP_NAME} ${APP_SERIES_NAME}"
|
||||
!insertmacro MUI_PAGE_STARTMENU ${APP_NAME} $StartmenuFolder
|
||||
|
||||
!if ${SETUPTYPE} != BUNDLE
|
||||
# Select latex.exe manually
|
||||
Page custom LatexFolder LatexFolder_LeaveFunction
|
||||
!endif # end if != BUNDLE
|
||||
# Select latex.exe manually
|
||||
Page custom LatexFolder LatexFolder_LeaveFunction
|
||||
|
||||
# Watch the components being installed.
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
@ -44,16 +44,6 @@ FunctionEnd
|
||||
#--------------------------------
|
||||
# visible installer sections
|
||||
|
||||
Section "!${APP_NAME}" SecCore
|
||||
SectionIn RO
|
||||
!if ${SETUPTYPE} == BUNDLE
|
||||
# if no TeX was found MiKTeX will be installed which requires space
|
||||
!if $PathLaTeX == ""
|
||||
AddSize 1020000 # size in KB
|
||||
!endif
|
||||
!endif
|
||||
SectionEnd
|
||||
|
||||
Section "$(SecFileAssocTitle)" SecFileAssoc
|
||||
StrCpy $CreateFileAssociations "true"
|
||||
SectionEnd
|
||||
@ -588,7 +578,6 @@ SectionGroupEnd
|
||||
|
||||
# Section descriptions
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)"
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssoc} "$(SecFileAssocDescription)"
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)"
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDictionaries} "$(SecDictionariesDescription)"
|
||||
@ -609,22 +598,6 @@ Function .onInit
|
||||
Quit
|
||||
${endif}
|
||||
|
||||
# check that another LyX installer is not currently running
|
||||
!if ${SETUPTYPE} == STANDARD
|
||||
FindProcDLL::FindProc "${BundleExeFile}"
|
||||
${if} $R0 == "1"
|
||||
MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
|
||||
Abort
|
||||
${endif}
|
||||
!endif
|
||||
!if ${SETUPTYPE} == BUNDLE
|
||||
FindProcDLL::FindProc "${ExeFile}"
|
||||
${if} $R0 == "1"
|
||||
MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
|
||||
Abort
|
||||
${endif}
|
||||
!endif
|
||||
|
||||
# Check that LyX is not currently running
|
||||
FindProcDLL::FindProc "${BIN_LYX}"
|
||||
${if} $R0 == "1"
|
||||
@ -714,13 +687,6 @@ Function .onInit
|
||||
|
||||
Call SearchExternal
|
||||
|
||||
#!if ${SETUPTYPE} == BUNDLE
|
||||
# # don't let the installer sections appear when the programs are already installed
|
||||
# ${if} $PathBibTeXEditor != ""
|
||||
# SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstJabRef}
|
||||
# ${endif}
|
||||
#!endif
|
||||
|
||||
# select sections of already installed spell-checker dictionaries, make them read-only
|
||||
# and set the necessary size to 0 bytes
|
||||
StrCpy $String $FoundDict
|
||||
|
@ -39,10 +39,8 @@ Configuration of standard NSIS header files
|
||||
# Functions to check and configure the LaTeX-system
|
||||
!include include\LaTeX.nsh
|
||||
|
||||
!if ${SETUPTYPE} != BUNDLE
|
||||
# Function for page to manually select LaTeX's installation folder
|
||||
!include gui\LaTeXFolder.nsh
|
||||
!endif # end if != BUNDLE
|
||||
# Function for page to manually select LaTeX's installation folder
|
||||
!include gui\LaTeXFolder.nsh
|
||||
|
||||
# Functions to download spell-checker and thesaurus dictionaries
|
||||
!include include\dictionaries.nsh
|
||||
|
@ -40,9 +40,7 @@ Var Pointer
|
||||
Var PSVPath
|
||||
Var PythonPath
|
||||
Var Search
|
||||
!if ${SETUPTYPE} != BUNDLE
|
||||
Var State
|
||||
!endif
|
||||
Var State
|
||||
Var SVGPath
|
||||
Var StartmenuFolder
|
||||
Var String
|
||||
|
@ -115,3 +115,14 @@ ${LangFileString} SecUnPreferencesDescription 'LyX-en konfigurazioa ezabatzen du
|
||||
($\"$AppPre\erabiltzailea\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
zuretzako edo erabiltzaile guztientzako (administratzailea bazara).'
|
||||
${LangFileString} SecUnProgramFilesDescription "Desinstalatu LyX eta bere osagai guztiak."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "MiKTeX-en aldaketak direla-eta, LyX-en bertsioen instalazioa 2.2.3 baino aurreratuagoa izan daiteke. MiKTeX-ek ezin du bertsio partziala sortu.$\r$\n\
|
||||
$\r$\n\
|
||||
Oraindik ez baduzu egin, Lyk bertsio berria instalatu aurretik, MiKTeX eguneratzeko azken bertsioa gomendatzen dizugu.$\r$\n\
|
||||
$\r$\n\
|
||||
Orain instalazioarekin jarraitu edo bertan behera utzi dezakezu MiKTeX eguneratzeko.$\r$\n\
|
||||
$\r$\n\
|
||||
(Barkatu itzulpen automatikorako.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "ABISUA: MiKTeX aldaketak"
|
||||
|
@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Suprimeix les carptes de configur
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
de tots els usuaris.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Desinstal·la el LyX i tots els seus components."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "A causa dels canvis en MiKTeX, la instal·lació de versions de LyX més tard de 2.2.3 pot provocar una actualització parcial que no permet fer servir MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
Si encara no ho heu fet, us recomanem que actualitzeu MiKTeX a la versió més recent abans d'instal·lar una nova versió de LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Ara podeu continuar amb la instal·lació o cancel·lar-lo per poder actualitzar MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Ho sento per la traducció automatitzada.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "ADVERTIMENT: canvis MiKTeX"
|
||||
|
@ -108,3 +108,13 @@ ${LangFileString} SecUnPreferencesDescription 'Smazat konfigurační adresář L
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
pro všechny uživatele.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Odinstalovat LyX a všechny jeho komponenty."
|
||||
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Kvůli změnám MiKTeX-u mohly starší instalace LyX-u (2.2.3) způsobit částečnou aktualizaci, která MiKTeX-u znemožní normální fungovaní.$\r$\n\
|
||||
$\r$\n\
|
||||
Pokud jste tak již neučinili, doporučujeme abyste si sami aktualizovali poslední verzi MiKTeX-u před instalací LyX-u.$\r$\n\
|
||||
$\r$\n\
|
||||
Nyní můžete buďto pokračovat v instalaci, anebo ji stornovat za účelem aktualizace MikTeX-u."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "Upozornění: Změny MiKTeX-u"
|
||||
|
@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Sletter LyX$\'s konfigurations ma
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
for alle brugere.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Afinstallerer LyX og alle dets komponenter."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "På grund af ændringer i MiKTeX kan installation af versioner af LyX senere end 2.2.3 forårsage en delvis opdatering, der gør MiKTeX ubrugelig.$\r$\n\
|
||||
$\r$\n\
|
||||
Hvis du ikke allerede har gjort det, anbefaler vi, at du opdaterer MiKTeX til den nyeste version, inden du installerer en ny version af LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Du kan nu enten fortsætte med installationen eller annullere det, så du kan opdatere MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Undskyld for den automatiske oversættelse.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "ADVARSEL: MiKTeX Ændringer"
|
||||
|
@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Verwijder LyX$\'s configuratie ma
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
voor alle gebruikers.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Verwijder LyX en alle bijbehorende onderdelen."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Als gevolg van wijzigingen in MiKTeX kan de installatie van versies van LyX later dan 2.2.3 een gedeeltelijke update veroorzaken waardoor MiKTeX onbruikbaar wordt.$\r$\n\
|
||||
$\r$\n\
|
||||
Als u dit nog niet hebt gedaan, raden we u aan MiKTeX bij te werken naar de nieuwste versie voordat u een nieuwe versie van LyX installeert.$\r$\n\
|
||||
$\r$\n\
|
||||
U kunt nu doorgaan met de installatie of deze annuleren, zodat u MiKTeX kunt bijwerken.$\r$\n\
|
||||
$\r$\n\
|
||||
(Sorry voor de automatische vertaling.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "WAARSCHUWING: MiKTeX-wijzigingen"
|
||||
|
@ -113,3 +113,12 @@ ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration$\r$
|
||||
(folder $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
for you or for all users (if you are admin).'
|
||||
${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Due to changes in MiKTeX, installation of versions of LyX later than 2.2.3 can cause a partial update that makes MiKTeX unusable.$\r$\n\
|
||||
$\r$\n\
|
||||
If you have not already done so, we recommend that you update MiKTeX to the latest version prior to installing a new version of LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
You may now either proceed with the installation or cancel it so you can update MiKTeX."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "WARNING: MiKTeX Changes"
|
||||
|
@ -114,3 +114,13 @@ ${LangFileString} SecUnPreferencesDescription 'Supprime le répertoire de config
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
pour tous les utilisateurs.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Désinstaller LyX et tous ses composants."
|
||||
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "À la suite de modifications de MiKTeX, l'installation de versions de LyX postérieures à 2.2.3 peut provoquer une mise à jour partielle qui rend MiKTeX inutilisable.$\r$\n\
|
||||
$\r$\n\
|
||||
Si ce n'est déjà fait, nous vous recommandons de mettre à jour MiKTeX à la dernière version disponible avant d'installer une nouvelle version de LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Vous pouvez maintenant continuer l'installation ou annuler celle-ci afin de mettre à jour MiKTeX. "
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "AVERTISSEMENT : modifications de MiKTeX"
|
||||
|
@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Elimina as pastas de configuraci
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
de todos os usuários.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todos os seus componentes."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Debido aos cambios en MiKTeX, a instalación de versións de LyX máis tarde de 2.2.3 pode causar unha actualización parcial que fai que MiKTeX non se poida usar.$\r$\n\
|
||||
$\r$\n\
|
||||
Se aínda non o fixeches, recomendamos que actualice MiKTeX á última versión antes de instalar unha nova versión de LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Agora podes continuar coa instalación ou cancelala para que poidas actualizar MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Sentímolo pola tradución automática)."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "AVISO: Cambios MiKTeX"
|
||||
|
@ -114,3 +114,13 @@ ${LangFileString} SecUnPreferencesDescription 'Löscht LyXs Benutzereinstellunge
|
||||
(Ordner $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\")$\r$\n\
|
||||
für Sie oder für alle Benutzer (wenn Sie Admin sind).'
|
||||
${LangFileString} SecUnProgramFilesDescription "Deinstalliert LyX und all seine Komponenten."
|
||||
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Aufgrund von Änderungen in MikTeX kann es bei Installationen von LyX in Versionen neuer als 2.2.3 zu unvollständigen Aktualisierungen kommen, aufgrund derer MikTeX nicht mehr funktioniert.$\r$\n\
|
||||
$\r$\n\
|
||||
Falls Sie es noch nicht getan haben, empfehlen wir, dass Sie MikTeX aktualisieren, bevor Sie LyX installieren.$\r$\n\
|
||||
$\r$\n\
|
||||
Sie können nun entweder mit der Installation fortfahren oder hierabbrechen, um zunächst MikTeX zu aktualisieren."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "ACHTUNG: MikTeX-Änderungen"
|
||||
|
@ -114,3 +114,14 @@ ${LangFileString} SecUnPreferencesDescription 'A LyX beállítások mappa törl
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
minden felhasználónál.'
|
||||
${LangFileString} SecUnProgramFilesDescription "A LyX és minden komponensének eltávolítása."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "A MiKTeX változásai miatt a LyX későbbi verzióinak telepítése a 2.2.3-os verzión keresztül részleges frissítést eredményezhet, ami a MiKTeX-t használhatatlanná teszi.$\r$\n\
|
||||
$\r$\n\
|
||||
Ha még nem tette meg, javasoljuk, hogy frissítse a MiKTeX-et a legújabb verzióra a LyX új verziójának telepítése előtt.$\r$\n\
|
||||
$\r$\n\
|
||||
Mostantól folytathatja a telepítést, vagy törölheti azt, így frissítheti a MiKTeX-et.$\r$\n\
|
||||
$\r$\n\
|
||||
(Elnézést az automatizált fordításért.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "FIGYELEM: MiKTeX változások"
|
||||
|
@ -114,3 +114,14 @@ ${LangFileString} SecUnPreferencesDescription 'Menghapus berkas konfigurasi LyX
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
untuk semua pengguna.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Penghapusan LyX serta semua komponen yang ada."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Karena perubahan pada MiKTeX, pemasangan versi LyX lebih lambat dari 2.2.3 dapat menyebabkan pembaruan parsial yang membuat MiKTeX tidak dapat digunakan.$\r$\n\
|
||||
$\r$\n\
|
||||
Jika Anda belum melakukannya, kami menyarankan Anda memperbarui MiKTeX ke versi terbaru sebelum menginstal versi baru LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Anda sekarang dapat melanjutkan instalasi atau membatalkannya sehingga Anda dapat memperbarui MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Maaf untuk terjemahan otomatis.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "PERINGATAN: Perubahan MiKTeX"
|
||||
|
@ -116,3 +116,15 @@ ${LangFileString} SecUnPreferencesDescription 'Elimina la cartella con la config
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
per tutti gli utenti.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Rimuove LyX e tutti i suoi componenti."
|
||||
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "A causa di cambiamenti in MiKTeX, l'installazione di versioni di LyX successive alla 2.2.3 può causare un aggiornamento parziale che rende MiKTeX inutilizzabile.$\r$\n\
|
||||
$\r$\n\
|
||||
Se non lo hai già fatto, ti consigliamo di aggiornare MiKTeX alla versione più recente prima di installare una nuova versione di LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Ora puoi procedere con l'installazione o cancellarla per poter aggiornare MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Ci scusiamo per la traduzione automatica.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "ATTENZIONE: modifiche MiKTeX"
|
||||
|
@ -114,3 +114,14 @@ ${LangFileString} SecUnPreferencesDescription 'ユーザー共通のLyXの設定
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
を削除します。'
|
||||
${LangFileString} SecUnProgramFilesDescription "LyXとすべての附属コンポーネントの導入解除を行います。"
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "MiKTeXが変更されたため、2.2.3より後のバージョンのLyXをインストールすると、MiKTeXを使用できなくする部分的な更新が発生する可能性があります。$\r$\n\
|
||||
$\r$\n\
|
||||
LyXの新しいバージョンをインストールする前に、MiKTeXを最新のバージョンにアップデートすることをお勧めします。$\r$\n\
|
||||
$\r$\n\
|
||||
これで、インストールを続行するか、キャンセルしてMiKTeXを更新することができます。$\r$\n\
|
||||
$\r$\n\
|
||||
自動翻訳には申し訳ありません"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "警告:MiKTeXの変更点"
|
||||
|
@ -114,3 +114,12 @@ ${LangFileString} SecUnPreferencesDescription 'Sletter LyX sine konfigurasjonsma
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
for alle brukere.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Avinstallerer LyX og alle delkomponenter."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "På grunn av endringar i MiKTeX kan installasjon av LyX versjonar nyare enn 2.2.3 føre til ein delvis oppdatering som gjer MiKTeX ubrukeleg.$\r$\n\
|
||||
$\r$\n\
|
||||
Dersom du ikkje har gjort det vil vi foreslå at du oppdaterer MiKTeX til siste versjon, før du installerer siste versjon av LyX. $\r$\n\
|
||||
$\r$\n\
|
||||
Du kan no velje å fortsetje med installasjonen eller avbryte for å oppdatere MiKTeX."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "ÅTVARING: Endringar i MiKTeX"
|
||||
|
@ -108,3 +108,12 @@ ${LangFileString} SecUnPreferencesDescription 'Usuwa folder konfiguracji LyX$\'a
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
wszystkim użytkownikom.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Deinstalacja LyX i wszystkich jego komponentów."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "W efekcie zmian w MiKTeX, instalacja wersji LyX starszej niż 2.2.3 może powodować częściową aktualizację, która uczyni MiKTeX niesprawnym.$\r$\n\
|
||||
$\r$\n\
|
||||
Jeżeli jeszcze tego nie uczyniłeś, zalecamy aktualizację MiKTeX do najnowszej wersji przed instalacją nowej wersji LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Teraz albo możesz kontynuować instalację lub przerwać, aby móc zaktualizować MiKTeX."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "UWAGA: Zmiany w MiKTeX"
|
||||
|
@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Apaga as pastas de configuração
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
de todos os utilizadores.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todas as suas componentes."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Devido a alterações no MiKTeX, a instalação de versões do LyX posteriores à 2.2.3 pode causar uma atualização parcial que torna o MiKTeX inutilizável.$\r$\n\
|
||||
$\r$\n\
|
||||
Se você ainda não fez isso, recomendamos que atualize o MiKTeX para a versão mais recente antes de instalar uma nova versão do LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Agora você pode continuar com a instalação ou cancelá-la para poder atualizar o MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Desculpe pela tradução automática.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "AVISO: Alterações no MiKTeX"
|
||||
|
@ -116,3 +116,15 @@ ${LangFileString} SecUnPreferencesDescription 'Exclui a configuração do LyX$\r
|
||||
(pasta $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
para você ou para todos os usuários (se você for um administrador)).'
|
||||
${LangFileString} SecUnProgramFilesDescription "Desinstalar o LyX e todos os seus componentes."
|
||||
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Devido a alterações no MiKTeX, a instalação de versões do LyX posteriores à 2.2.3 pode causar uma atualização parcial que torna o MiKTeX inutilizável.$\r$\n\
|
||||
$\r$\n\
|
||||
Se você ainda não fez isso, recomendamos que atualize o MiKTeX para a versão mais recente antes de instalar uma nova versão do LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Agora você pode continuar com a instalação ou cancelá-la para poder atualizar o MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Desculpe pela tradução automática.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "AVISO: Alterações no MiKTeX"
|
||||
|
@ -109,3 +109,14 @@ ${LangFileString} SecUnPreferencesDescription 'Şterge directorul cu setările L
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
pentru toţi utilizatorii.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Dezinstalaţi programul LyX şi toate componentele lui."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\
|
||||
$\r$\n\
|
||||
Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\
|
||||
$\r$\n\
|
||||
Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\
|
||||
$\r$\n\
|
||||
(Ne pare rău pentru traducerea automată.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "AVERTISMENT: MiKTeX Modificări"
|
||||
|
@ -113,3 +113,14 @@ ${LangFileString} SecUnPreferencesDescription 'Удалить настройки
|
||||
(каталог $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
для вас или для всех пользователей (если вы администратор).'
|
||||
${LangFileString} SecUnProgramFilesDescription "Удалить LyX и все его компоненты."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Из-за изменений в MiKTeX установка версий LyX позже 2.2.3 может привести к частичному обновлению, что делает MiKTeX непригодным.$\r$\n\
|
||||
$\r$\n\
|
||||
Если вы еще этого не сделали, мы рекомендуем вам обновить MiKTeX до последней версии до установки новой версии LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Вы можете либо продолжить установку, либо отменить ее, чтобы обновить MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Извините за автоматизированный перевод.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "ПРЕДУПРЕЖДЕНИЕ: Изменения в MiKTeX"
|
||||
|
@ -115,3 +115,13 @@ ${LangFileString} SecUnPreferencesDescription 'Odstráni konfiguračný adresár
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
pre všetkých užívateľov (keď máte administrátorské práva).'
|
||||
${LangFileString} SecUnProgramFilesDescription "Odinštaluj LyX a všetky jeho súčiastky."
|
||||
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Kvôli zmenám MiKTeX-u, inštalácia verzie LyX-u novšej ako 2.2.3 môže byť dôvodom parciálnej aktualizácie. To by mohlo zrobiť MiKTeX nepoužiteľným.$\r$\n\
|
||||
$\r$\n\
|
||||
Ak ste to doteraz ešte neurobili, odporúčame aktualizovať MiKTeX na jeho najnovšiu verziu pred inštaláciou novej LyX- verzie.$\r$\n\
|
||||
$\r$\n\
|
||||
Teraz môžte buď s inštaláciou pokračovať, alebo ju zrušiť aby ste mohli aktualizovať MiKTeX."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "VAROVANIE: Zmeny MiKTeX-u"
|
||||
|
@ -114,3 +114,14 @@ ${LangFileString} SecUnPreferencesDescription 'Elimina las carpetas de configura
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
de todos los usuarios.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Desinstala LyX y todos sus componentes."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Debido a cambios en MiKTeX, la instalación de versiones de LyX posteriores a la 2.2.3 puede causar una actualización parcial que hace que MiKTeX no se pueda utilizar.$\r$\n\
|
||||
$\r$\n\
|
||||
Si aún no lo ha hecho, le recomendamos que actualice MiKTeX a la última versión antes de instalar una nueva versión de LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
YAhora puede continuar con la instalación o cancelarla para que pueda actualizar MiKTeX.$\r$\n\
|
||||
$\r$\n\
|
||||
(Perdón por la traducción automatizada.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "ADVERTENCIA: Cambios de MiKTeX"
|
||||
|
@ -108,3 +108,12 @@ ${LangFileString} SecUnPreferencesDescription 'Raderar LyX-konfiguration$\r$\n\
|
||||
(katalog $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
för dig eller för alla användare (om du är admin).'
|
||||
${LangFileString} SecUnProgramFilesDescription "Avinstallera LyX och alla dess komponenter."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "På grund av ändringar i MiKTeX kan installering av LyX senare än version 2.2.3 orsaka en delvis uppdatering som gör MiKTeX oanvändbar.$\r$\n\
|
||||
$\r$\n\
|
||||
Om du inte redan har gjort det så rekommenderar vi att du uppdaterar MiKTeX till den senaste versionen innan installering av en ny version av LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Du kan nu antingen fortsätta med installeringen eller avbryta den så du kan uppdatera MiKTeX."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "Varning: MiKTeX-ändringar"
|
||||
|
@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration fol
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
for all users.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "MiKTeX'teki değişikliklerden dolayı, LyX sürümlerinin 2.2.3'den sonraki sürümleri, MiKTeX'i kullanılamaz hale getiren kısmi bir güncelleştirmeye neden olabilir.$\r$\n\
|
||||
$\r$\n\
|
||||
Henüz yapmadıysanız, yeni bir LyX sürümü yüklemeden önce MiKTeX'i en son sürüme güncellemenizi öneririz.$\r$\n\
|
||||
$\r$\n\
|
||||
Artık yükleme ile devam edebilir veya iptal edebilirsiniz, böylece MiKTeX'i güncelleyebilirsiniz.$\r$\n\
|
||||
$\r$\n\
|
||||
(Otomatik çeviri için özür dilerim.)"
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "UYARI: MiKTeX Değişiklikleri"
|
||||
|
@ -114,3 +114,12 @@ ${LangFileString} SecUnPreferencesDescription 'Вилучає теку з нал
|
||||
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
|
||||
для всіх користувачів.'
|
||||
${LangFileString} SecUnProgramFilesDescription "Вилучити LyX і всі його компоненти."
|
||||
|
||||
# MikTeX Update Stuff
|
||||
${LangFileString} MiKTeXUpdateMsg "Через зміни у MiKTeX встановлення версій LyX, випущених після версії 2.2.3, може спричинити часткове оновлення, яке зробить MiKTeX непридатним до користування.$\r$\n\
|
||||
$\r$\n\
|
||||
Якщо ви ще цього не зробили, рекомендуємо вам оновити MiKTeX до найсвіжішої версії до встановлення нової версії LyX.$\r$\n\
|
||||
$\r$\n\
|
||||
Тепер ви можете або продовжити встановлення LyX, або скасувати його для оновлення MiKTeX."
|
||||
|
||||
${LangFileString} MiKTeXUpdateHeader "УВАГА: Зміни у MiKTeX"
|
||||
|
@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
|
||||
|
||||
!define APP_VERSION_MAJOR 2
|
||||
!define APP_VERSION_MINOR 3
|
||||
!define APP_VERSION_REVISION 0
|
||||
!define APP_VERSION_REVISION 1
|
||||
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
|
||||
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise ""
|
||||
!define APP_VERSION_BUILD 5 # Start with 1 for the installer releases of each version
|
||||
!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each version
|
||||
|
||||
!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
|
||||
|
||||
@ -28,17 +28,16 @@ These typically need to be modified for each LyX release
|
||||
!ifndef ExeFile
|
||||
!define ExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
|
||||
!endif
|
||||
!ifndef BundleExeFile
|
||||
!define BundleExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Bundle-${APP_VERSION_BUILD}.exe"
|
||||
!endif
|
||||
|
||||
#--------------------------------
|
||||
# File locations
|
||||
# !!! you need to adjust them to the folders in your Windows system !!!
|
||||
|
||||
!define FILES_LYX "D:\LyXPackage2.3\LyX"
|
||||
!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
|
||||
!define FILES_QT "C:\Qt\Qt5.9.4\5.9.4\msvc2015"
|
||||
!define FILES_BASE "C:\Users\rikih\LyX"
|
||||
!define FILES_GIT "${FILES_BASE}\git\development\Win32\packaging\installer"
|
||||
!define FILES_LYX "${FILES_BASE}\LyX23"
|
||||
!define FILES_DEPS "${FILES_BASE}\Dependencies"
|
||||
!define FILES_QT "${FILES_BASE}\LyX23"
|
||||
!define ClassFileDir "${FILES_LYX}\Resources\tex"
|
||||
!define DVIPostFileDir "${FILES_DEPS}\tex"
|
||||
|
||||
@ -47,10 +46,4 @@ These typically need to be modified for each LyX release
|
||||
|
||||
!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
|
||||
|
||||
!define MiKTeXDeliveredVersion "2.9"
|
||||
!define ImageMagickVersion "7.0.7"
|
||||
|
||||
# definitions for the Complete installer
|
||||
!if ${SETUPTYPE} == BUNDLE
|
||||
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
|
||||
!endif
|
||||
|
@ -233,34 +233,11 @@ Var ConfigureReturn
|
||||
|
||||
Section -ConfigureScript
|
||||
|
||||
SetOutPath "$INSTDIR\Resources"
|
||||
|
||||
# ask to update MiKTeX
|
||||
${if} $LaTeXInstalled == "MiKTeX"
|
||||
Call UpdateMiKTeX # function from latex.nsh
|
||||
# install all necessary packages at once because this is much faster then to install the packages one by one
|
||||
DetailPrint $(TEXT_CONFIGURE_LYX)
|
||||
${if} $MultiUser.Privileges != "Admin"
|
||||
${andif} $MultiUser.Privileges != "Power"
|
||||
# call the non-admin version
|
||||
# at first we need to synchronize the package database
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"'
|
||||
${else}
|
||||
${if} $MiKTeXUser != "HKCU" # call the admin version
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--update-db"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"'
|
||||
${else}
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
|
||||
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"'
|
||||
${endif}
|
||||
${endif}
|
||||
${endif}
|
||||
|
||||
DetailPrint $(TEXT_CONFIGURE_LYX)
|
||||
nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
|
||||
# $ConfigureReturn is "0" if successful, otherwise "1"
|
||||
Pop $ConfigureReturn # Return value
|
||||
# Should we do something with that?
|
||||
|
||||
SectionEnd
|
||||
|
||||
|
@ -24,15 +24,13 @@ Section -ProgramFiles SecProgramFiles
|
||||
StrCpy $INSTDIR "$INSTDIR\${APP_DIR}"
|
||||
${endif}
|
||||
|
||||
!if ${SETUPTYPE} != BUNDLE
|
||||
# abort the installation if no LaTeX was found but should be used
|
||||
${if} $PathLaTeX == ""
|
||||
${andif} $State == "0"
|
||||
SetOutPath $TEMP # to be able to delete the $INSTDIR
|
||||
RMDir /r $INSTDIR
|
||||
Abort
|
||||
${endif}
|
||||
!endif # end if != BUNDLE
|
||||
# abort the installation if no LaTeX was found but should be used
|
||||
${if} $PathLaTeX == ""
|
||||
${andif} $State == "0"
|
||||
SetOutPath $TEMP # to be able to delete the $INSTDIR
|
||||
RMDir /r $INSTDIR
|
||||
Abort
|
||||
${endif}
|
||||
|
||||
# Install and register the core LyX files
|
||||
|
||||
@ -51,7 +49,7 @@ Section -ProgramFiles SecProgramFiles
|
||||
Delete "$INSTDIR\bin\LyX2.3.exe"
|
||||
Delete "$INSTDIR\bin\tex2lyx2.3.exe"
|
||||
!insertmacro FileListQtBin File "${FILES_QT}\bin\"
|
||||
!insertmacro FileListMSVC File "${FILES_MSVC}\"
|
||||
!insertmacro FileListMinGW File "${FILES_LYX}\bin\"
|
||||
!insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
|
||||
!insertmacro FileListDTLBin File "${FILES_DTL}\"
|
||||
!insertmacro FileListRsvg File "${FILES_RSVG}\"
|
||||
@ -60,32 +58,26 @@ Section -ProgramFiles SecProgramFiles
|
||||
|
||||
# Qt plugin DLLs
|
||||
SetOutPath "$INSTDIR\bin\imageformats"
|
||||
!insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
|
||||
!insertmacro FileListQtImageformats File "${FILES_QT}\bin\imageformats\"
|
||||
SetOutPath "$INSTDIR\bin\iconengines"
|
||||
!insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\"
|
||||
!insertmacro FileListQtIconengines File "${FILES_QT}\bin\iconengines\"
|
||||
SetOutPath "$INSTDIR\bin\platforms"
|
||||
!insertmacro FileListQtPlatforms File "${FILES_QT}\plugins\platforms\"
|
||||
!insertmacro FileListQtPlatforms File "${FILES_QT}\bin\platforms\"
|
||||
SetOutPath "$INSTDIR\bin\styles"
|
||||
!insertmacro FileListQtStyles File "${FILES_QT}\bin\styles\"
|
||||
|
||||
# Resources
|
||||
SetOutPath "$INSTDIR"
|
||||
# recursively copy all files under Resources
|
||||
File /r "${FILES_LYX}\Resources"
|
||||
|
||||
!if ${SETUPTYPE} == BUNDLE
|
||||
|
||||
# extract the MiKTeX installer
|
||||
File /r "${FILES_LYX}\external"
|
||||
|
||||
# install MiKTeX if not already installed
|
||||
Call InstallMiKTeX # function from LaTeX.nsh
|
||||
|
||||
!endif # end if BUNDLE
|
||||
File /r "${FILES_DEPS}\Resources"
|
||||
|
||||
# Python
|
||||
SetOutPath "$INSTDIR"
|
||||
# recursively copy all files under Python
|
||||
File /r "${FILES_PYTHON}"
|
||||
# register .py files if necessary
|
||||
#FIXME We probably should not do this, as dicussed on the list.
|
||||
# register .py files if necessary
|
||||
ReadRegStr $0 SHCTX "Software\Classes\Python.File\shell\open\command" ""
|
||||
${if} $0 == "" # if nothing was found
|
||||
WriteRegStr SHCTX "Software\Classes\Python.File\shell\open\command" "" '"$INSTDIR\Python\python.exe" "%1" %*'
|
||||
@ -94,7 +86,7 @@ Section -ProgramFiles SecProgramFiles
|
||||
WriteRegStr SHCTX "Software\Classes\Python.File" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to test if they were registered by this LyX version
|
||||
${endif}
|
||||
|
||||
# Compile all Pyton files to byte-code
|
||||
# Compile all Python files to byte-code
|
||||
# The user using the scripts may not have write access
|
||||
FileOpen $PythonCompileFile "$INSTDIR\compilepy.py" w
|
||||
FileWrite $PythonCompileFile "import compileall$\r$\n"
|
||||
@ -133,10 +125,6 @@ Section -ProgramFiles SecProgramFiles
|
||||
StrCpy $GhostscriptPath "$INSTDIR\ghostscript\bin"
|
||||
${endif}
|
||||
|
||||
# install eLyXer
|
||||
SetOutPath "$INSTDIR\Python\Lib"
|
||||
!insertmacro FileListeLyXer File "${FILES_ELYXER}\"
|
||||
|
||||
# install unoconv
|
||||
SetOutPath "$INSTDIR\Python\Lib"
|
||||
!insertmacro FileListUnoConv File "${FILES_UNOCONV}\"
|
||||
|
Loading…
Reference in New Issue
Block a user