Var PythonCompileFile
Var PythonCompileReturn
-Var DownloadResult
Section -ProgramFiles SecProgramFiles
+ # if the $INSTDIR does not contain "LyX" we must add a subfolder to avoid that LyX will e.g.
+ # be installed directly to C:\programs - the uninstaller will then delete the whole
+ # C:\programs directory
+ StrCpy $String $INSTDIR
+ StrCpy $Search "LyX"
+ Call StrPoint # function from LyXUtils.nsh
+ ${if} $Pointer == "-1"
+ 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
+
# Install and register the core LyX files
# The macros are defined in filelists.nsh
# Binaries
SetOutPath "$INSTDIR\bin"
!insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
- !insertmacro FileListLyXLauncher File "${FILES_LYX}\bin\"
!insertmacro FileListQtBin File "${FILES_QT}\bin\"
- !insertmacro FileListDll File "${FILES_DEPS}\bin\"
!insertmacro FileListMSVC File "${FILES_MSVC}\"
!insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
!insertmacro FileListDTLBin File "${FILES_DTL}\"
+ !insertmacro FileListRsvg File "${FILES_RSVG}\"
!insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
!insertmacro FileListPDFViewBin File "${FILES_PDFVIEW}\"
- !insertmacro FileListPDFToolsBin File "${FILES_PDFTOOLS}\"
- !insertmacro FileListMetaFile2EPS File "${FILES_METAFILE2EPS}\"
+
+ # Qt plugin DLLs
+ SetOutPath "$INSTDIR\bin\imageformats"
+ !insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
+ SetOutPath "$INSTDIR\bin\iconengines"
+ !insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\"
+ SetOutPath "$INSTDIR\bin\platforms"
+ !insertmacro FileListQtPlatforms File "${FILES_QT}\plugins\platforms\"
# Resources
SetOutPath "$INSTDIR"
# recursively copy all files under Resources
File /r "${FILES_LYX}\Resources"
+ !if ${SETUPTYPE} == BUNDLE
+
+ # extract the Jabref and MiKTeX installer
+ File /r "${FILES_LYX}\external"
+
+ # install MiKTeX if not already installed
+ Call InstallMiKTeX # function from LaTeX.nsh
+
+ !endif # end if BUNDLE
+
# Python
SetOutPath "$INSTDIR"
# recursively copy all files under Python
File /r "${FILES_PYTHON}"
- # add MSVC runtimes
- #SetOutPath "$INSTDIR\python"
- #!insertmacro FileListMSVC File "${FILES_MSVC}\"
-
+ # 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" %*'
+ WriteRegStr SHCTX "Software\Classes\Python.File\DefaultIcon" "" "$INSTDIR\Python\DLLs\py.ico"
+ WriteRegStr SHCTX "Software\Classes\.py" "" "Python.File"
+ 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
# The user using the scripts may not have write access
WriteRegStr SHCTX "SOFTWARE\Classes\Applications" "AutoRun" "$INSTDIR\imagemagick\convert.exe $$"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "BinPath" "$INSTDIR\imagemagick"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "CoderModulesPath" "$INSTDIR\imagemagick\modules\coders"
- WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "ConfigurePath" "$INSTDIR\imagemagick\config"
+ WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "ConfigurePath" "$INSTDIR\imagemagick"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "FilterModulesPath" "$INSTDIR\imagemagick\modules\filters"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "LibPath" "$INSTDIR\imagemagick"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "BinPath" "$INSTDIR\imagemagick"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "CoderModulesPath" "$INSTDIR\imagemagick\modules\coders"
- WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "ConfigurePath" "$INSTDIR\imagemagick\config"
+ WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "ConfigurePath" "$INSTDIR\imagemagick"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "FilterModulesPath" "$INSTDIR\imagemagick\modules\filters"
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "LibPath" "$INSTDIR\imagemagick"
- WriteRegDWORD SHCTX "SOFTWARE\ImageMagick\Current" "QuantumDepth" 0x00000010
+ WriteRegDWORD SHCTX "SOFTWARE\ImageMagick\Current" "QuantumDepth" 0x00000010
WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "Version" "${ImageMagickVersion}"
+ WriteRegStr SHCTX "SOFTWARE\ImageMagick" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
# Components of Ghostscript
- SetOutPath "$INSTDIR\ghostscript"
- File /r "${FILES_GHOSTSCRIPT}\"
- !insertmacro FileListMSVC File "${FILES_MSVC}\"
+ ${if} $GhostscriptPath == ""
+ SetOutPath "$INSTDIR\ghostscript"
+ File /r "${FILES_GHOSTSCRIPT}\"
+ !insertmacro FileListMSVC File "${FILES_MSVC}\"
+ StrCpy $GhostscriptPath "$INSTDIR\ghostscript\bin"
+ ${endif}
!if ${SETUPTYPE} == BUNDLE
- # extract the Jabref and MiKTeX installer
- File /r "${FILES_LYX}\external"
-
- # install MiKTeX if not already installed
- Call InstallMiKTeX # function from LaTeX.nsh
-
- # install JabRef if not already installed and the user selected it
- # if no BibTeX editor is installed
+ # install JabRef if not already installed, the user selected it
+ # and if no BibTeX editor is installed
${if} $PathBibTeXEditor == ""
- ${if} $InstallJabRef == "true"
- # launch installer
- MessageBox MB_OK|MB_ICONINFORMATION "$(JabRefInfo)"
- ExecWait "$INSTDIR\${JabRefInstall}"
- # test if JabRef is now installed
- StrCpy $PathBibTeXEditor ""
- ReadRegStr $PathBibTeXEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString"
- ${if} $PathBibTeXEditor == ""
- MessageBox MB_OK|MB_ICONEXCLAMATION "$(JabRefError)"
+ ${andif} $InstallJabRef == "true"
+ # launch installer
+ MessageBox MB_OK|MB_ICONINFORMATION "$(JabRefInfo)" /SD IDOK
+ IfSilent 0 +2
+ ExecWait "$INSTDIR\${JabRefInstall} /S"
+ ExecWait "$INSTDIR\${JabRefInstall}"
+ # test if JabRef is now installed
+ StrCpy $PathBibTeXEditor ""
+ ${if} $MultiUser.Privileges == "Admin"
+ ${orif} $MultiUser.Privileges == "Power"
+ ReadRegStr $PathBibTeXEditor HKLM "Software\JabRef" "Path"
+ ${else}
+ ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path"
+ ${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}"
+ StrCpy $PathBibTeXEditor ""
+ ${endif}
+ ${endif}
+ ${if} $PathBibTeXEditor == ""
+ MessageBox MB_OK|MB_ICONEXCLAMATION "$(JabRefError)" /SD IDOK
+ ${else}
+ # special entry that it was installed together with LyX
+ # so that we can later uninstall it together with LyX
+ ${if} $MultiUser.Privileges == "Admin"
+ ${orif} $MultiUser.Privileges == "Power"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "UninstallString" "$PathBibTeXEditor\uninstall.exe"
${else}
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to tell the uninstaller that it was installed with LyX
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "OnlyWithLyX" "Yes${APP_SERIES_KEY}"
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "UninstallString" "$PathBibTeXEditor\uninstall.exe"
${endif}
${endif}
- ${endif}
- !endif
+ ${endif} # end if PathBibTeXEditor
+ !endif # end if BUNDLE
- # install eLyXer as Python module
- ExecWait '"$INSTDIR\python\python.exe" "$INSTDIR\python\setup.py" install'
+ # install eLyXer
+ SetOutPath "$INSTDIR\Python\Lib"
+ !insertmacro FileListeLyXer File "${FILES_ELYXER}\"
+
+ # install unoconv
+ SetOutPath "$INSTDIR\Python\Lib"
+ !insertmacro FileListUnoConv File "${FILES_UNOCONV}\"
- # install the LaTeX class files that are delivered with LyX
+ # install the LaTeX class files that are delivered with LyX to MiKTeX
# and enable MiKTeX's automatic package installation
${if} $LaTeXInstalled == "MiKTeX"
Call ConfigureMiKTeX # Function from LaTeX.nsh
${endif}
+ # install the LaTeX class files that are delivered with LyX to TeXLive
+ ${if} $LaTeXInstalled == "TeXLive"
+ Call ConfigureTeXLive # Function from LaTeX.nsh
+ ${endif}
+
+ # download dictionaries and thesaurus
+ ${if} $DictCodes != ""
+ Call InstallHunspellDictionaries # Function from dictionaries.nsh
+ ${endif}
+ ${if} $ThesCodes != ""
+ Call InstallThesaurusDictionaries # Function from dictionaries.nsh
+ ${endif}
+ # finally delete the list of mirrors
+ Delete "$INSTDIR\Resources\DictionaryMirrors.txt"
# Create uninstaller
WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}"
NSISdl::download "${DOWNLOAD_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}"
Pop ${RET} # Return value (OK if succesful)
- ${If} ${RET} != "OK"
- # Download failed, try again (usally we get a different mirror)
+ ${If} ${RET} != "success"
+ ${AndIf} ${RET} != "cancel"
+ # Download failed, try once again before giving up
+ # (usally we get a different mirror)
NSISdl::download "${DOWNLOAD_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}"
Pop ${RET}
${EndIf}
!macroend
#--------------------------------
-# Extenral components
+# External components
-Var PathAllUsers
-Var PathCurrentUser
+#Var PathAllUsers
+#Var PathCurrentUser
!macro EXTERNAL COMPONENT
ExecWait '"$PLUGINSDIR\${COMPONENT}Setup.exe"'
- # Updates the path environment variable of the instaler process to the latest system value
- ReadRegStr $PathAllUsers HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" Path
- ReadRegStr $PathCurrentUser HKCU "Environment" Path
- System::Call 'kernel32::SetEnvironmentVariableA(t, t) i("Path", "$PathAllUsers;$PathCurrentUser").'
+ # Updates the path environment variable of the installer process to the latest system value
+# ReadRegStr $PathAllUsers HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" Path
+# ReadRegStr $PathCurrentUser HKCU "Environment" Path
+# System::Call 'kernel32::SetEnvironmentVariableA(t, t) i("Path", "$PathAllUsers;$PathCurrentUser").'
Call Search${COMPONENT}
!insertmacro DOWNLOAD_FILE $DownloadResult "${COMPONENT}" "${COMPONENT}Setup.exe" ""
- ${If} $DownloadResult != "OK"
- # Download failed
+ ${If} $DownloadResult != "success"
+ ${AndIf} $DownloadResult != "cancel"
+ # Download failed after trying twice - ask user
MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(TEXT_DOWNLOAD_FAILED_${COMPONENT}) ($DownloadResult)" IDYES download_${COMPONENT}
Goto noinstall_${COMPONENT}
${EndIf}
projects / lyx.git / blobdiff