installer:

- fix an uninstall issue
- fix a typo
- update settings

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40538 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-12-21 22:09:24 +00:00
parent cdb56cafb3
commit 9473a7e6f8
3 changed files with 4 additions and 4 deletions

View File

@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2 !define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 0 !define APP_VERSION_MINOR 0
!define APP_VERSION_REVISION 2 !define APP_VERSION_REVISION 2
!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version !define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version
!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display
@ -50,7 +50,7 @@ These typically need to be modified for each LyX release
!define JabRefVersion "2.7" !define JabRefVersion "2.7"
!define MiKTeXDeliveredVersion "2.9" !define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "6.7.3" !define ImageMagickVersion "6.7.4"
# definitions for the Complete installer # definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE !if ${SETUPTYPE} == BUNDLE

View File

@ -242,7 +242,7 @@ Function StartLyX
# the time consuming LaTeX package installation # the time consuming LaTeX package installation
#Exec 'cmd /K " "$INSTDIR\bin\lyx.exe""' #Exec 'cmd /K " "$INSTDIR\bin\lyx.exe""'
Exec "$INSTDIR\${AppRun}" Exec "$INSTDIR\${APP_RUN}"
FunctionEnd FunctionEnd

View File

@ -71,7 +71,7 @@ Section "un.LyX" un.SecUnProgramFiles
# Application folder # Application folder
SetOutPath "$TEMP" SetOutPath "$TEMP"
RMDir "$INSTDIR" RMDir /r "$INSTDIR"
# Registry keys # Registry keys
DeleteRegKey SHCTX "${APP_REGKEY_SETUP}" DeleteRegKey SHCTX "${APP_REGKEY_SETUP}"