anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

installer: sync with branch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32422 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-12-07 23:31:35 +00:00
parent 01f46c0079
commit f354b05df5
5 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
development/Win32/packaging/AltInstaller/ConfigLyX.nsh
View File

@ -48,7 +48,8 @@ Function ConfigureLyX
Delete "$INSTDIR\Resources\lyxrc.dist"
FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" w
# set some general things
FileWrite $R1 '\screen_zoom "120"$\r$\n'
FileWrite $R1 '\screen_zoom "120"$\r$\n\
\accept_compound true$\r$\n'
${if} "$PathPrefix" != ""
FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
${endif}
@ -62,8 +63,8 @@ Function ConfigureLyX
${if} $SVGPath != ""
FileWrite $R1 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\
\converter "svg" "png" "inkscape --without-gui --file=$$$$i --export-png=$$$$o" ""$\r$\n\
\converter "svg" "pdf" "inkscape --file=$$$$i --export-area-drawing --without-gui --export-pdf=$$$$o" ""$\r$\n\
\converter "svg" "pdf2" "inkscape --file=$$$$i --export-area-drawing --without-gui --export-pdf=$$$$o" ""'
\converter "svg" "pdf" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui --export-pdf=$$$$p/$$$$o" ""$\r$\n\
\converter "svg" "eps" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui --export-eps=$$$$p/$$$$o" ""'
${endif}
FileClose $R1
IfErrors 0 +2

33
development/Win32/packaging/AltInstaller/InstallActions-update.nsh
View File

@ -214,8 +214,37 @@ Function RefreshRegUninst
WriteRegStr HKLM "SOFTWARE\Aspell" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}"
${endif}
# install eLyXer as Python module
Call eLyXer # function from InstallThirdPartyProgs.nsh
# eLyXer
# first test if Python is installed
ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" ""
${if} $PythonPath == ""
ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" ""
${endif}
${if} $PythonPath == ""
ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.0\InstallPath" ""
${endif}
${if} $PythonPath == ""
ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.1\InstallPath" ""
${endif}
${if} $PythonPath != ""
StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end
${endif}
# now install eLyXer as Python module
${if} $PythonPath != ""
# a Python module cannot simply started with
# ExecWait '$PythonPath\python.exe "$INSTDIR\bin\setup.py" install'
# therefore run a script
StrCpy $1 $INSTDIR 2 # get drive letter
FileOpen $R1 "$INSTDIR\bin\eLyXer.bat" w
FileWrite $R1 '$1$\r$\n\
cd "$INSTDIR\bin"$\r$\n\
"$PythonPath\python.exe" setup.py install'
FileClose $R1
ExecWait '"$INSTDIR\bin\eLyXer.bat"'
Delete "$INSTDIR\bin\eLyXer.bat"
${else}
ExecWait '"$INSTDIR\bin\python.exe" "$INSTDIR\bin\setup.py" install'
${endif}
# Metafile2eps
Var /GLOBAL RegLocation

2
development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
View File

@ -88,7 +88,7 @@ Var WMFPath
# Function to configure LyX
!include "ConfigLyX.nsh"
# Function to configure needed third-party programs
# Functions to configure needed third-party programs
!include "InstallThirdPartyProgs.nsh"
# Function for page to install Aspell dictionaries

2
development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
View File

@ -89,7 +89,7 @@ Var WMFPath
# Function to configure LyX
!include "ConfigLyX.nsh"
# Function to configure needed third-party programs
# Functions to configure needed third-party programs
!include "InstallThirdPartyProgs.nsh"
# Function for page to install Aspell dictionaries

2
development/Win32/packaging/AltInstaller/MissingPrograms.nsh
View File

@ -86,7 +86,7 @@ Function MissingPrograms
# test if Python is installed
# only use an existing python when it is version 2.5 or newer because some
# Compaq and Dell PCs were delivered with outdated Python interpreters
# older Compaq and Dell PCs were delivered with outdated Python interpreters
ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" ""
${if} $PythonPath == ""
ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" ""