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: fix now all compiler warnings

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39497 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-08-19 22:19:09 +00:00
parent 6b36f46b4f
commit 3d8905fc36
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,9 @@ Var DelPythonFiles
Var EditorPath Var EditorPath
Var GhostscriptPath Var GhostscriptPath
Var ImageEditorPath Var ImageEditorPath
Var InstallJabRef !if ${SETUPTYPE} == BUNDLE
Var InstallJabRef
!endif
Var JabRefInstalled Var JabRefInstalled
Var LaTeXName Var LaTeXName
Var LaTeXInstalled Var LaTeXInstalled

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

@ -11,7 +11,7 @@ Installation of program files, dictionaries and external components
Var PythonCompileFile Var PythonCompileFile
Var PythonCompileReturn Var PythonCompileReturn
Var DownloadResult #Var DownloadResult
Section -ProgramFiles SecProgramFiles Section -ProgramFiles SecProgramFiles
@ -112,7 +112,7 @@ Section -ProgramFiles SecProgramFiles
${endif} ${endif}
${endif} ${endif}
${endif} ${endif}
!endif !endif # end if BUNDLE
# install eLyXer as Python module # install eLyXer as Python module
ExecWait '"$INSTDIR\python\python.exe" "$INSTDIR\python\setup.py" install' ExecWait '"$INSTDIR\python\python.exe" "$INSTDIR\python\setup.py" install'
@ -155,8 +155,8 @@ SectionEnd
#-------------------------------- #--------------------------------
# Extenral components # Extenral components
Var PathAllUsers #Var PathAllUsers
Var PathCurrentUser #Var PathCurrentUser
!macro EXTERNAL COMPONENT !macro EXTERNAL COMPONENT
@ -184,10 +184,10 @@ Var PathCurrentUser
ExecWait '"$PLUGINSDIR\${COMPONENT}Setup.exe"' ExecWait '"$PLUGINSDIR\${COMPONENT}Setup.exe"'
# Updates the path environment variable of the instaler process to the latest system value # 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 $PathAllUsers HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" Path
ReadRegStr $PathCurrentUser HKCU "Environment" Path # ReadRegStr $PathCurrentUser HKCU "Environment" Path
System::Call 'kernel32::SetEnvironmentVariableA(t, t) i("Path", "$PathAllUsers;$PathCurrentUser").' # System::Call 'kernel32::SetEnvironmentVariableA(t, t) i("Path", "$PathAllUsers;$PathCurrentUser").'
Call Search${COMPONENT} Call Search${COMPONENT}