anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

installer:

Browse Source 
- fix bundle installer so that MiKTeX is installed before LyX
- fix some ImageMagick settings
- cleanups and visual feedback for new installations

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40533 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-12-21 01:12:43 +00:00
parent 28b401b40e
commit cdb56cafb3
5 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/Win32/packaging/installer/include/gui.nsh
View File

@ -51,8 +51,10 @@ BrandingText " "
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "LyX ${APP_SERIES_NAME}"
!insertmacro MUI_PAGE_STARTMENU ${APP_NAME} $StartmenuFolder
# Select latex.exe manually
Page custom LatexFolder LatexFolder_LeaveFunction
!if ${SETUPTYPE} != BUNDLE
# Select latex.exe manually
Page custom LatexFolder LatexFolder_LeaveFunction
!endif # end if != BUNDLE
# Watch the components being installed.
!insertmacro MUI_PAGE_INSTFILES

6
development/Win32/packaging/installer/include/nsis.nsh
View File

@ -42,8 +42,10 @@ Configuration of standard NSIS header files
# Functions to check and configure the LaTeX-system
!include include\LaTeX.nsh
# Function for page to manually select LaTeX's installation folder
!include gui\LaTeXFolder.nsh
!if ${SETUPTYPE} != BUNDLE
# Function for page to manually select LaTeX's installation folder
!include gui\LaTeXFolder.nsh
!endif # end if != BUNDLE
#--------------------------------
# Include standard functions

4
development/Win32/packaging/installer/include/variables.nsh
View File

@ -38,9 +38,11 @@ Var Pointer
Var PSVPath
Var PythonPath
Var Search
!if ${SETUPTYPE} != BUNDLE
Var State
!endif
Var SVGPath
Var StartmenuFolder
Var State
Var String
Var UpdateFNDBReturn
Var UserList

15
development/Win32/packaging/installer/setup/configure.nsh
View File

@ -217,12 +217,18 @@ Section -ConfigureScript
SetOutPath "$INSTDIR\Resources"
DetailPrint $(TEXT_CONFIGURE_LYX)
nsExec::ExecToLog '"$INSTDIR\python\python.exe" "$INSTDIR\Resources\configure.py"'
nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
Pop $ConfigureReturn # Return value
# ask to update MiKTeX
${if} $LaTeXInstalled == "MiKTeX"
Call UpdateMiKTeX # function from latex.nsh
# for new installations a second run is necessary to give the users feedback about
# the ongoing installation of LaTeX packages
# a new installed MiKTeX needs some time until it is ready to install packages
!if ${SETUPTYPE} == BUNDLE
nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
!endif # end if == BUNDLE
${endif}
SectionEnd
@ -232,10 +238,11 @@ SectionEnd
Function StartLyX
# Enable desktop icon creation when there is an icon already
# Old shortcuts need to be updated
# run LyX in a command line window to give the users feedback about
# the time consuming LaTeX package installation
Exec "$INSTDIR\${APP_RUN}"
#Exec 'cmd /K " "$INSTDIR\bin\lyx.exe""'
Exec "$INSTDIR\${AppRun}"
FunctionEnd

20
development/Win32/packaging/installer/setup/install.nsh
View File

@ -42,6 +42,16 @@ Section -ProgramFiles SecProgramFiles
# 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
@ -67,12 +77,12 @@ Section -ProgramFiles SecProgramFiles
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
@ -88,12 +98,6 @@ Section -ProgramFiles SecProgramFiles
!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
${if} $PathBibTeXEditor == ""