mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
installer:
- updates again - better merge of InstallActions git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18360 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
59065c3dd5
commit
b303cdd837
@ -1,6 +1,6 @@
|
||||
Function DeleteFiles
|
||||
|
||||
# list with deleted files for LyX 1.5svn xx-05-2007
|
||||
# list with deleted files for LyX 1.5beta3 16-05-2007
|
||||
Delete "$INSTDIR\bin\PDFViewWin8.exe"
|
||||
Delete "$INSTDIR\Resources\examples\cv.lyx"
|
||||
Delete "$INSTDIR\Resources\examples\TableExamples.lyx"
|
||||
|
@ -1,6 +1,4 @@
|
||||
# this file contains the main installer sections
|
||||
|
||||
!if ${INSTALLER_VERSION} == "Complete"
|
||||
# this file contains the main installer section
|
||||
|
||||
# The '-' makes the section invisible.
|
||||
Section "-Installation actions" SecInstallation
|
||||
@ -15,10 +13,14 @@
|
||||
File /r "${PRODUCT_SOURCEDIR}\bin"
|
||||
File /r "${PRODUCT_SOURCEDIR}\etc"
|
||||
File /r "${PRODUCT_SOURCEDIR}\Resources"
|
||||
File /r "${PRODUCT_SOURCEDIR}\external"
|
||||
!if ${INSTALLER_VERSION} == "Complete"
|
||||
File /r "${PRODUCT_SOURCEDIR}\external"
|
||||
!endif
|
||||
|
||||
# install MiKTeX if not already installed
|
||||
Call InstallMiKTeX # function from LaTeX.nsh
|
||||
!if ${INSTALLER_VERSION} == "Complete"
|
||||
# install MiKTeX if not already installed
|
||||
Call InstallMiKTeX # function from LaTeX.nsh
|
||||
!endif
|
||||
|
||||
# install Ghostscript if not already installed
|
||||
Call Ghostscript # function from InstallThirdPartyProgs.nsh
|
||||
@ -32,74 +34,21 @@
|
||||
# install Aiksaurus if not already installed
|
||||
Call Aiksaurus # function from InstallThirdPartyProgs.nsh
|
||||
|
||||
# install GSview if not already installed and the user selected it
|
||||
Call PostScript # function from InstallThirdPartyProgs.nsh
|
||||
|
||||
# install JabRef if not already installed and the user selected it
|
||||
Call BibTeX # function from InstallThirdPartyProgs.nsh
|
||||
!if ${INSTALLER_VERSION} == "Complete"
|
||||
# install GSview if not already installed and the user selected it
|
||||
Call PostScript # function from InstallThirdPartyProgs.nsh
|
||||
|
||||
# install JabRef if not already installed and the user selected it
|
||||
Call BibTeX # function from InstallThirdPartyProgs.nsh
|
||||
!endif
|
||||
|
||||
# install the LaTeX class files that are delivered with LyX
|
||||
# and enable MiKTeX's automatic package installation
|
||||
Call ConfigureMiKTeX # Function from LaTeX.nsh
|
||||
|
||||
# install Aspell dictionaries
|
||||
Call InstallAspellDictionary # function from Aspell.nsh
|
||||
|
||||
# configure LyX
|
||||
Call ConfigureLyX # Function from ConfigLyX.nsh
|
||||
|
||||
# refresh shell, update the environment variables otherwise the first
|
||||
# configure run will fail when MiKTeX was just installed
|
||||
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
|
||||
|
||||
# create Uninstaller
|
||||
WriteUninstaller "${PRODUCT_UNINSTALL_EXE}"
|
||||
|
||||
# run LyX's configure script
|
||||
MessageBox MB_OK|MB_ICONINFORMATION "$(LatexConfigInfo)"
|
||||
ExecWait '"$INSTDIR\Resources\configLyX.bat"'
|
||||
Delete "$INSTDIR\Resources\configLyX.bat"
|
||||
|
||||
# ask to update MiKTeX
|
||||
Call UpdateMiKTeX # function from latex.nsh
|
||||
|
||||
SectionEnd
|
||||
|
||||
!endif # endif ${INSTALLER_VERSION} == "Complete"
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
!if ${INSTALLER_VERSION} == "Small"
|
||||
|
||||
# The '-' makes the section invisible.
|
||||
Section "-Installation actions" SecInstallation
|
||||
|
||||
# dummy actions to avoid NSIS warnings
|
||||
StrCpy $FileName ""
|
||||
StrCpy $NewString ""
|
||||
StrCpy $OldString ""
|
||||
|
||||
# extract all files
|
||||
SetOutPath "$INSTDIR"
|
||||
File /r "${PRODUCT_SOURCEDIR}\bin"
|
||||
File /r "${PRODUCT_SOURCEDIR}\etc"
|
||||
File /r "${PRODUCT_SOURCEDIR}\Resources"
|
||||
|
||||
# install GhostScript if not already installed
|
||||
Call Ghostscript # function from InstallThirdPartyProgs.nsh
|
||||
|
||||
# install ImageMagick if not already installed
|
||||
Call ImageMagick # function from InstallThirdPartyProgs.nsh
|
||||
|
||||
# install Aspell if not already installed
|
||||
Call InstallAspell # function from Aspell.nsh
|
||||
|
||||
# install Aiksaurus if not already installed
|
||||
Call Aiksaurus # function from InstallThirdPartyProgs.nsh
|
||||
|
||||
# install the LaTeX class files that are delivered with LyX
|
||||
# and enable MiKTeX's automatic package installation
|
||||
Call ConfigureMiKTeX # Function from LaTeX.nsh
|
||||
|
||||
# install Aspell dictionaries
|
||||
Call InstallAspellDictionary # function from Aspell.nsh
|
||||
@ -114,11 +63,9 @@
|
||||
MessageBox MB_OK|MB_ICONINFORMATION "$(LatexConfigInfo)"
|
||||
ExecWait '"$INSTDIR\Resources\configLyX.bat"'
|
||||
Delete "$INSTDIR\Resources\configLyX.bat"
|
||||
|
||||
|
||||
# ask to update MiKTeX
|
||||
Call UpdateMiKTeX # function from latex.nsh
|
||||
|
||||
SectionEnd
|
||||
|
||||
!endif # endif ${INSTALLER_VERSION} == "Small"
|
||||
|
||||
|
@ -249,9 +249,8 @@ Function ConfigureMiKTeX
|
||||
FunctionEnd
|
||||
|
||||
Function UpdateMiKTeX
|
||||
# installs the LaTeX class files that are delivered with LyX
|
||||
# ask to update MiKTeX
|
||||
|
||||
# ask to update MiKTeX
|
||||
${if} $MiKTeXInstalled == "yes"
|
||||
MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater
|
||||
UpdateNow:
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
!define PRODUCT_DIR "D:\LyXPackage1.5"
|
||||
!define PRODUCT_NAME "LyX"
|
||||
!define PRODUCT_VERSION "1.5beta3-15-05-2007"
|
||||
!define PRODUCT_VERSION "1.5beta3-16-05-2007"
|
||||
!define PRODUCT_VERSION_SHORT "150svn"
|
||||
!define PRODUCT_SUBFOLDER "lyx15"
|
||||
!define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
|
||||
|
@ -1,6 +1,6 @@
|
||||
Function UpdateModifiedFiles
|
||||
|
||||
# list with modified files for LyX 1.5svn xx-05-2007
|
||||
# list with modified files for LyX 1.5beta3 16-05-2007
|
||||
SetOutPath "$INSTDIR\bin"
|
||||
File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here
|
||||
File "${PRODUCT_SOURCEDIR}\bin\pdfclose.exe"
|
||||
@ -28,6 +28,7 @@ Function UpdateModifiedFiles
|
||||
File "${PRODUCT_SOURCEDIR}\Resources\doc\es\TOC.lyx" # must be here when another \doc file has been changed
|
||||
SetOutPath "$INSTDIR\Resources\examples"
|
||||
File "${PRODUCT_SOURCEDIR}\Resources\examples\armenian-article.lyx"
|
||||
File "${PRODUCT_SOURCEDIR}\Resources\examples\listings.lyx"
|
||||
SetOutPath "$INSTDIR\Resources\examples\de"
|
||||
File "${PRODUCT_SOURCEDIR}\Resources\examples\de\TabellenBeispiel.lyx"
|
||||
SetOutPath "$INSTDIR\Resources\examples\fr"
|
||||
|
Loading…
Reference in New Issue
Block a user